Changeset 31337 in vbox for trunk/src/VBox/Main/solaris

Timestamp:

Aug 3, 2010 2:05:05 PM (15 years ago)

Author:

vboxsync

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

64376

Message:

Main/Solaris: New DVD drive enumeration, works on Solaris 10 & Nevada. Removed now obsolete NSL_RESOLVED stuff on Solaris.

File:

• trunk/src/VBox/Main/solaris/NetIf-solaris.cpp (modified) (4 diffs)

trunk/src/VBox/Main/solaris/NetIf-solaris.cpp

@@ -41 +41 @@
 #include <limits.h>
 #include <stdio.h>
-#ifdef VBOX_SOLARIS_NSL_RESOLVED
-# include <libdevinfo.h>
-#endif
+#include <libdevinfo.h>
 #include <net/if.h>
 #include <sys/socket.h>
@@ -272 +270 @@
 }
 
-# ifdef VBOX_SOLARIS_NSL_RESOLVED
 static int vboxSolarisAddPhysHostIface(di_node_t Node, di_minor_t Minor, void *pvHostNetworkInterfaceList)
 {
@@ -292 +289 @@
     return DI_WALK_CONTINUE;
 }
-# endif /* VBOX_SOLARIS_NSL_RESOLVED */
 
 int NetIfList(std::list <ComObjPtr<HostNetworkInterface> > &list)
 {
-
-#  ifdef VBOX_SOLARIS_NSL_RESOLVED
 
     /*
@@ -315 +309 @@
     if (VBoxSolarisLibDlpiFound())
         g_pfnLibDlpiWalk(vboxSolarisAddLinkHostIface, &list, 0);
-
-#  endif    /* VBOX_SOLARIS_NSL_RESOLVED */
 
     /*