aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/wtap-int.h
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2008-10-24 00:42:09 +0000
committerBill Meier <wmeier@newsguy.com>2008-10-24 00:42:09 +0000
commit8afa208ffbb9ecc1b6195aef20d269e2fefd88d3 (patch)
tree9dba16a45db59ebe1b10965d38f3844a27cc911f /wiretap/wtap-int.h
parentede39bfe1fed5b6ea7949c610cffe34315266803 (diff)
Windows build: #include winsock2.h only when needed.
#include winsock2.h pulls in about 90 distinct .h files and about 140 total .h files. Currently winsock2.h is (mostly unnecessarily) included for each dissector via packet.h/wtap.h. This patch removes #include winsock2.h from wtap.h and then includes winsock2.h (or windows.h) in the few specific places required. With this patch, my Windows Wireshark build takes about 30% less time. svn path=/trunk/; revision=26535
Diffstat (limited to 'wiretap/wtap-int.h')
-rw-r--r--wiretap/wtap-int.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index cd63fd937a..757703c298 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -31,10 +31,11 @@
#include <stdio.h>
#include <time.h>
-#ifdef HAVE_LIBZ
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h>
#endif
+
+#ifdef HAVE_LIBZ
#include <zlib.h>
#define FILE_T gzFile
#else /* No zLib */