src-client

Timestamp:

Apr 14, 2016 5:29:15 PM (9 years ago)

Author:

vboxsync

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

106619

Message:

Main/Console+Host: winsock2 include fixing

File:

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

-              r60411
+              r60509
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+/* For some reason Windows burns in sdk\...\winsock.h if this isn't included first. */
+#include "VBox/com/ptr.h"
+// VBoxNetCfg-win.h needs winsock2.h and thus MUST be included before any other
+// header file includes Windows.h.
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
+# include <VBox/VBoxNetCfg-win.h>
+#endif
 #include "ConsoleImpl.h"
 …
 # endif
 # if defined(RT_OS_WINDOWS)
-#  include <VBox/VBoxNetCfg-win.h>
 #  include <Ntddndis.h>
 #  include <devguid.h>

Note: See TracChangeset for help on using the changeset viewer.