Changeset 12808 in vbox for trunk/src

Timestamp:

Sep 29, 2008 3:19:15 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37160

Message:

SUPDrv: shared the symbol table dragging in symbols into the link on darwin and solaris.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (2 diffs)
• darwin/SUPDrv-darwin.cpp (modified) (2 diffs)
• solaris/SUPDrv-solaris.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -47 +47 @@
 #include <VBox/log.h>
 #include <VBox/err.h>
+#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
+# include <iprt/crc32.h>
+# include <iprt/net.h>
+#endif
 /* VBox/x86.h not compatible with the Linux kernel sources */
 #ifdef RT_OS_LINUX
@@ -389 +393 @@
 };
 
+#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
+/**
+ * Drag in the rest of IRPT since we share it with the
+ * rest of the kernel modules on darwin.
+ */
+PFNRT g_apfnVBoxDrvIPRTDeps[] =
+{
+    (PFNRT)RTCrc32,
+    (PFNRT)RTErrConvertFromErrno,
+    (PFNRT)RTNetIPv4IsHdrValid
+    (PFNRT)RTNetIPv4TCPChecksum,
+    (PFNRT)RTNetIPv4UDPChecksum,
+    (PFNRT)RTUuidCompare,
+    (PFNRT)RTUuidCompareStr,
+    (PFNRT)RTUuidFromStr,
+    NULL
+};
+#endif  /* RT_OS_DARWIN || RT_OS_SOLARIS */
+
 
 /**

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -54 +54 @@
 #include <iprt/process.h>
 #include <iprt/alloc.h>
-#include <iprt/uuid.h>
 #include <iprt/err.h>
 #include <VBox/log.h>
@@ -204 +203 @@
 static int32_t volatile g_cSessions = 0;
 
-
-/*
- * Drag in the rest of IRPT since we share it with the
- * rest of the kernel modules on darwin.
- */
-PFNRT g_apfnVBoxDrvIPRTDeps[] =
-{
-    (PFNRT)RTUuidCompare,
-    (PFNRT)RTErrConvertFromErrno,
-    NULL
-};
 
 

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -60 +60 @@
 #include <iprt/string.h>
 
-/**
- * Drag in symbols from R0 Runtime required by VBoxNetFlt.
- */
-#ifdef VBOX_WITH_NETFLT
-# include <iprt/crc32.h>
-# include <iprt/uuid.h>
-# include <iprt/net.h>
-
-static RTR0PTR g_vboxNetFltSolarisRTR0Symbols[] =
-{
-    (void *)RTCrc32,
-    (void *)RTUuidFromStr,
-    (void *)RTUuidCompareStr,
-    (void *)RTNetIPv4UDPChecksum,
-    (void *)RTNetIPv4TCPChecksum,
-    (void *)RTNetIPv4IsHdrValid
-};
-#endif  /* VBOX_WITH_NETFLT */
 
 /*******************************************************************************
@@ -356 +338 @@
                 return DDI_SUCCESS;
             }
-            
+
             return DDI_FAILURE;
         }