diff options
author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-10-27 17:19:23 +0000 |
---|---|---|
committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-10-27 17:19:23 +0000 |
commit | 73dde275c12a441df9d210a8da29fed88754c5f2 (patch) | |
tree | c0010821938dc0e4132318f098b0773a48ee224a /gtk/main.c | |
parent | 2b8cd626f78199529fbeb35e90ef0b13fae8e4e9 (diff) | |
download | wireshark-73dde275c12a441df9d210a8da29fed88754c5f2.tar.gz wireshark-73dde275c12a441df9d210a8da29fed88754c5f2.tar.bz2 wireshark-73dde275c12a441df9d210a8da29fed88754c5f2.zip |
Move declaration of wsaData (for Win32) out of HAVE_LIBPCAP #ifdef block.
It's needed for both capture and non-capture variants of Win32 builds.
svn path=/trunk/; revision=2542
Diffstat (limited to 'gtk/main.c')
-rw-r--r-- | gtk/main.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk/main.c b/gtk/main.c index bc1478a630..fbe3b9fc68 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.161 2000/10/20 04:26:40 gram Exp $ + * $Id: main.c,v 1.162 2000/10/27 17:19:23 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -818,14 +818,19 @@ main(int argc, char *argv[]) int opt; extern char *optarg; gboolean arg_error = FALSE; + #ifdef HAVE_LIBPCAP #ifdef WIN32 char pcap_version[] = "0.4a6"; - WSADATA wsaData; #else extern char pcap_version[]; #endif #endif + +#ifdef WIN32 + WSADATA wsaData; +#endif + char *gpf_path, *pf_path; int gpf_open_errno, pf_open_errno; int err; |