Changeset 9124 in vbox for trunk

Timestamp:

May 26, 2008 1:48:23 PM (17 years ago)

Author:

vboxsync

Message:

Cleanup of the Solaris 10 detection, reducing ifdef clutter in the C files and avoid using the system namespace.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Builtins.cpp (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/VBox/Devices/Network/DrvTAP.cpp (modified) (2 diffs)
• src/VBox/Devices/Network/solaris/vbox-libdlpi.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -1477 +1477 @@
 ifeq ($(KBUILD_TARGET),solaris)
  ifeq ($(origin SOLARIS_VER),undefined)
-   export SOLARIS_VER       := $(shell uname -s)_$(subst .,_,$(shell uname -r))
- endif
- DEFS.solaris += __$(SOLARIS_VER)
+  export SOLARIS_VER := $(shell uname -r | $(SED_EXT) 's|\([0-9]\)\.\([0-9]\)|$$(int-add $$(int-mul 100, \1), \2))
+  ifeq ($(SOLARIS_VER),510)
+   DEFS.solaris += RT_OS_SOLARIS_10
+   # Solaris 10 does not include crossbow.
+   VBOX_WITH_CROSSBOW =
+   VBOX_SOLARIS_10 = 1
+  endif
+  DEFS.solaris += SOLARIS_VER=$(SOLARIS_VER)
+ endif
 endif
 

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(RT_OS_SOLARIS_10)) || defined(RT_OS_WINDOWS)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);
     if (VBOX_FAILURE(rc))

trunk/src/VBox/Devices/Makefile.kmk

@@ -610 +610 @@
 Drivers_SOURCES.solaris = \
         Audio/solaudio.c \
-        Network/DrvTAP.cpp \
+        $(if $(VBOX_SOLARIS_10),,Network/DrvTAP.cpp) \
         Storage/DrvHostBase.cpp \
         Storage/DrvHostDVD.cpp

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

@@ -19 +19 @@
  * additional information or have any questions.
  */
-
-#if !defined(RT_OS_SOLARIS) || !defined(__SunOS_5_10)
 
 /*******************************************************************************
@@ -1093 +1091 @@
     NULL
 };
-
-#endif /* !defined(RT_OS_SOLARIS) || !defined(__SunOS_5_10) */

trunk/src/VBox/Devices/Network/solaris/vbox-libdlpi.cpp

@@ -19 +19 @@
  * additional information or have any questions.
  */
-
-/* Solaris 10 and below has no dlpi. */
-#ifndef __SunOS_5_10
 
 #include "vbox-libdlpi.h"
@@ -85 +82 @@
     }
 }
-
-#endif /* __SunOS_5_10 */