diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-01-21 07:37:49 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-01-21 07:37:49 +0000 |
commit | 5904f05078da51a512d77f38d40d943a300e3e8c (patch) | |
tree | 8bf88b7d322dbff0c32339f1136ea77ad7dda975 /packet-socks.c | |
parent | 0d9b33da275ff33df0d8ed48816257398376c42b (diff) |
Include files from the "epan" directory and subdirectories thereof with
"epan/..." pathnames, so as to avoid collisions with header files in any
of the directories in which we look (e.g., "proto.h", as some other
package has its own "proto.h" file which it installs in the top-level
include directory).
Don't add "-I" flags to search "epan", as that's no longer necessary
(and we want includes of "epan" headers to fail if the "epan/" is left
out, so that we don't re-introduce includes lacking "epan/").
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4586 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-socks.c')
-rw-r--r-- | packet-socks.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-socks.c b/packet-socks.c index 9d3c50da83..d5cab46e7e 100644 --- a/packet-socks.c +++ b/packet-socks.c @@ -2,7 +2,7 @@ * Routines for socks versions 4 &5 packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-socks.c,v 1.33 2001/12/11 21:35:01 jfoster Exp $ + * $Id: packet-socks.c,v 1.34 2002/01/21 07:36:43 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -71,14 +71,14 @@ # include "snprintf.h" #endif -#include "packet.h" -#include "resolv.h" +#include <epan/packet.h> +#include <epan/resolv.h> #include "alignment.h" -#include "conversation.h" +#include <epan/conversation.h> #include "packet-tcp.h" #include "packet-udp.h" -#include "strutil.h" +#include <epan/strutil.h> #define compare_packet(X) (X == (pinfo->fd->num)) |