Changeset 9113 in vbox

Timestamp:

May 26, 2008 10:27:33 AM (17 years ago)

Author:

vboxsync

Message:

fixed Solaris version detection

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Builtins.cpp (modified) (1 diff)
• src/VBox/Devices/Network/DrvTAP.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -1477 +1477 @@
 ifeq ($(KBUILD_TARGET),solaris)
  ifeq ($(origin SOLARIS_VER),undefined)
-   export SOLARIS_VER       := $(shell uname -s)_$(shell uname -r)
+   export SOLARIS_VER       := $(shell uname -s)_$(subst .,_,$(shell uname -r))
  endif
  DEFS.solaris += __$(SOLARIS_VER)

trunk/src/VBox/Devices/Builtins.cpp

@@ -203 +203 @@
         return rc;
 #endif
-#if defined(RT_OS_L4) || defined(RT_OS_LINUX) || defined(RT_OS_OS2) || (defined(RT_OS_SOLARIS) && !defined(__SunOS_5.10)) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_L4) || defined(RT_OS_LINUX) || defined(RT_OS_OS2) || (defined(RT_OS_SOLARIS) && !defined(__SunOS_5_10)) || defined(RT_OS_WINDOWS)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);
     if (VBOX_FAILURE(rc))

trunk/src/VBox/Devices/Network/DrvTAP.cpp

@@ -20 +20 @@
  */
 
-#if !defined(RT_OS_SOLARIS) || !defined(__SunOS_5.10)
+#if !defined(RT_OS_SOLARIS) || !defined(__SunOS_5_10)
 
 /*******************************************************************************
@@ -1094 +1094 @@
 };
 
-#endif /* !defined(RT_OS_SOLARIS) || !defined(__SunOS_5.10) */
+#endif /* !defined(RT_OS_SOLARIS) || !defined(__SunOS_5_10) */