diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-11-16 21:36:39 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-11-16 21:36:39 +0000 |
| commit | 367ff66c7099f910fba611764941b95028bbee4b (patch) | |
| tree | 111df52574d40b35e719061398ec52c7e384a2a1 /epan/packet.c | |
| parent | ca072f82f7eb6bee22b4f0d4d1b4dba5ea6a30b7 (diff) | |
At least in my compile environment, we don't need "inet_v6defs.h" to
compile "epan/packet.c", and including it without including <winsock2.h>
before it means that, as <winsock2.h> appears to get included after we
include "inet_v6defs.h", we get complaints about a redefinition of
AF_INET6; removing the include of "inet_v6defs.h" sqelches that warning.
If we *do* need "inet_v6defs.h" on some platforms, put it back, but put
in an include of <winsock2.h> before it, to keep the warning away - if
we ever use AF_INET6 in "epan/packet.c", we want to use the one from
<winsock2.h> if it defines it, as that's what the rest of Ethereal uses.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6649 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/packet.c b/epan/packet.c index 5a0e3c795e..52bda772ed 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -1,7 +1,7 @@ /* packet.c * Routines for packet disassembly * - * $Id: packet.c,v 1.82 2002/11/15 03:10:36 guy Exp $ + * $Id: packet.c,v 1.83 2002/11/16 21:36:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -39,10 +39,6 @@ #include <ctype.h> #include <time.h> -#ifdef NEED_INET_V6DEFS_H -# include "inet_v6defs.h" -#endif - #include "packet.h" #include "timestamp.h" |