aboutsummaryrefslogtreecommitdiffstats
path: root/capture_win_ifnames.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2012-11-23 13:59:56 +0000
committerBill Meier <wmeier@newsguy.com>2012-11-23 13:59:56 +0000
commit2ee8d88f0083442aa7134f6010aec034c168c0b8 (patch)
tree0c18e6ab4b2f4d4319ef2e51dec9d54b18ba7e29 /capture_win_ifnames.c
parenta05cf8c4d2358d906b5ba3f66ed076478137efc9 (diff)
'if 0' wrapping of config.h no longer required;
Also, '#include winsock2.h' should be before '#include windows.h' Based upon information provided by Gisle Vanem. See https://www.wireshark.org/lists/wireshark-dev/201211/msg00096.html and message thread starting at https://www.wireshark.org/lists/wireshark-dev/201211/msg00108.html svn path=/trunk/; revision=46155
Diffstat (limited to 'capture_win_ifnames.c')
-rw-r--r--capture_win_ifnames.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/capture_win_ifnames.c b/capture_win_ifnames.c
index 0fb57885a9..723a7d21ed 100644
--- a/capture_win_ifnames.c
+++ b/capture_win_ifnames.c
@@ -23,14 +23,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#if 0 /* XXX: including config.h causes compilation errors; TBD: why */
#include "config.h"
-#endif
#ifdef _WIN32
-#include <windows.h>
#include <winsock2.h>
+#include <windows.h>
#include <iphlpapi.h>
#include <stdio.h>
#include <stdlib.h>