Changeset 26957 in vbox for trunk/src/VBox

Timestamp:

Mar 2, 2010 4:43:53 PM (15 years ago)

Author:

vboxsync

Message:

header cleanup

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -50 +50 @@
 #include <VBox/vmapi.h>
 #include <VBox/err.h>
+#include <VBox/param.h>
+#include <VBox/pdmapi.h> /* For PDMR3DriverAttach/PDMR3DriverDetach */
 #include <VBox/version.h>
 #include <VBox/HostServices/VBoxClipboardSvc.h>
 #ifdef VBOX_WITH_CROGL
-#include <VBox/HostServices/VBoxCrOpenGLSvc.h>
+# include <VBox/HostServices/VBoxCrOpenGLSvc.h>
 #endif
 #ifdef VBOX_WITH_GUEST_PROPS
@@ -69 +71 @@
 #include <VBox/com/array.h>
 
-#if defined(RT_OS_SOLARIS) && defined(VBOX_WITH_NETFLT)
-# include <zone.h>
-#endif
-
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_NETFLT)
-# include <unistd.h>
-# include <sys/ioctl.h>
-# include <sys/socket.h>
-# include <linux/types.h>
-# include <linux/if.h>
-# include <linux/wireless.h>
-#endif
-
-#if defined(RT_OS_FREEBSD) && defined(VBOX_WITH_NETFLT)
-# include <unistd.h>
-# include <sys/types.h>
-# include <sys/ioctl.h>
-# include <sys/socket.h>
-# include <net/if.h>
-# include <net80211/ieee80211_ioctl.h>
-#endif
-
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
-# include <VBox/WinNetConfig.h>
-# include <Ntddndis.h>
-# include <devguid.h>
-#endif
-
-#if !defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
-# include <HostNetworkInterfaceImpl.h>
-# include <netif.h>
-# include <stdlib.h>
-#endif
+#ifdef VBOX_WITH_NETFLT
+# ifdef RT_OS_SOLARIS
+#  include <zone.h>
+# endif
+# ifdef RT_OS_LINUX
+#  include <unistd.h>
+#  include <sys/ioctl.h>
+#  include <sys/socket.h>
+#  include <linux/types.h>
+#  include <linux/if.h>
+#  include <linux/wireless.h>
+# endif
+# ifdef RT_OS_FREEBSD
+#  include <unistd.h>
+#  include <sys/types.h>
+#  include <sys/ioctl.h>
+#  include <sys/socket.h>
+#  include <net/if.h>
+#  include <net80211/ieee80211_ioctl.h>
+# endif
+# ifdef RT_OS_WINDOWS
+#  include <VBox/WinNetConfig.h>
+#  include <Ntddndis.h>
+#  include <devguid.h>
+# else
+#  include <HostNetworkInterfaceImpl.h>
+#  include <netif.h>
+#  include <stdlib.h>
+# endif
+#endif /* VBOX_WITH_NETFLT */
 
 #include "DHCPServerRunner.h"
-
-#include <VBox/param.h>
-#include <VBox/pdmapi.h> /* For PDMR3DriverAttach/PDMR3DriverDetach */
 
 #if defined(RT_OS_DARWIN) && !defined(VBOX_OSE)