diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-10-15 05:38:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-10-15 05:38:01 +0000 |
| commit | d54e50d6a2bf47990bcaaa9c59d97c89298a26e4 (patch) | |
| tree | 24309f7abe2e566d0e04ac537b58ab9bd3da6063 /wiretap/wtap-int.h | |
| parent | f0269dd749fb44e3132fd2bc61b3ece52f129c4d (diff) | |
From Jason House: include <winsock2.h> early in "wtap-int.h" on Win32
builds with zlib - "zlib.h", alas, includes <winsock.h>, and you can't
include <winsock.h> before including <winsock2.h> (at least you can
include <winsock2.h> before including <winsock.h>; thank heaven for
small favors).
svn path=/trunk/; revision=6427
Diffstat (limited to 'wiretap/wtap-int.h')
| -rw-r--r-- | wiretap/wtap-int.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h index b9b3b0d686..610e14afa9 100644 --- a/wiretap/wtap-int.h +++ b/wiretap/wtap-int.h @@ -1,6 +1,6 @@ /* wtap-int.h * - * $Id: wtap-int.h,v 1.28 2002/08/28 20:30:45 jmayer Exp $ + * $Id: wtap-int.h,v 1.29 2002/10/15 05:38:01 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -32,6 +32,9 @@ #include <time.h> #ifdef HAVE_LIBZ +#ifdef HAVE_WINSOCK2_H +#include <winsock2.h> +#endif #include <zlib.h> #define FILE_T gzFile #else /* No zLib */ |