Changeset 14725 in vbox for trunk/src/VBox

Timestamp:

Nov 27, 2008 5:31:56 PM (16 years ago)

Author:

vboxsync

Message:

Main: use statically linked libhal on Linux, fix burns on Solaris

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -1887 +1887 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
-# ifdef VBOX_WITH_LIBHAL  /* Linux, load libhal statically */
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_LIBHAL)
+/* Linux, load libhal statically */
 
 /** Helper function for setting up a libhal context */
@@ -2065 +2065 @@
 }
 
-# elif defined VBOX_USE_LIBHAL  /* Solaris hosts, loading libhal at runtime */
+# elif defined(RT_OS_SOLARIS) && defined(VBOX_USE_LIBHAL)
+/* Solaris hosts, loading libhal at runtime */
 
 /**
@@ -2378 +2379 @@
     return halSuccess;
 }
-# endif  /* VBOX_USE_HAL defined */
+#endif  /* VBOX_WITH_HAL and VBOX_USE_HAL */
+
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
 
 /**