Changeset 9112 in vbox for trunk

Timestamp:

May 26, 2008 10:11:34 AM (17 years ago)

Author:

vboxsync

Message:

Hopefully working solaris 10 detection.

Location:

trunk/src/VBox/Devices

Files:

• Builtins.cpp (modified) (1 diff)
• Network/DrvTAP.cpp (modified) (2 diffs)
• Network/solaris/vbox-libdlpi.cpp (modified) (2 diffs)

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(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) || SOLARIS2 >= 11
+#if !defined(RT_OS_SOLARIS) || !defined(__SunOS_5.10)
 
 /*******************************************************************************
@@ -1094 +1094 @@
 };
 
-#endif /* !defined(RT_OS_SOLARIS) || SOLARIS2 >= 11 */
+#endif /* !defined(RT_OS_SOLARIS) || !defined(__SunOS_5.10) */

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

@@ -21 +21 @@
 
 /* Solaris 10 and below has no dlpi. */
-#if SOLARIS2 >= 11
+#ifndef __SunOS_5.10
 
 #include "vbox-libdlpi.h"
@@ -86 +86 @@
 }
 
-#endif /* SOLARIS2 >= 11 */
+#endif /* __SunOS_5.10 */