diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-10-31 07:57:22 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-10-31 07:57:22 +0000 |
| commit | e9f239d6b2cb88b32e3a2f070458de95c7315424 (patch) | |
| tree | 048541113e59d3ef1bc99955809d6637f0600d43 /util.c | |
| parent | fc0299d3f2732176121836ecb01d1e6812c16f69 (diff) | |
Include <windows.h> so that OSVERSIONINFO and the like are defined on
Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8841 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -1,7 +1,7 @@ /* util.c * Utility routines * - * $Id: util.c,v 1.69 2003/10/10 06:05:48 guy Exp $ + * $Id: util.c,v 1.70 2003/10/31 07:57:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -64,6 +64,16 @@ typedef int mode_t; /* for win32 */ #include <pcap.h> #endif /* HAVE_LIBPCAP */ +/* + * This has to come after the include of <pcap.h>, as the include of + * <pcap.h> might cause <winsock2.h> to be included, and if we've + * already included <winsock.h> as a result of including <windows.h>, + * we get a bunch of redefinitions. + */ +#ifdef HAVE_WINDOWS_H +#include <windows.h> +#endif + #ifdef HAVE_SOME_SNMP #ifdef HAVE_NET_SNMP |