diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-01-21 07:37:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-01-21 07:37:49 +0000 |
| commit | ee5ca25d31984b9768d5ae9419dea0e3b493b479 (patch) | |
| tree | 8bf88b7d322dbff0c32339f1136ea77ad7dda975 /tethereal.c | |
| parent | 64c8032c3b617f4be70603e0779905434546a36f (diff) | |
| download | wireshark-ee5ca25d31984b9768d5ae9419dea0e3b493b479.tar.gz wireshark-ee5ca25d31984b9768d5ae9419dea0e3b493b479.tar.bz2 wireshark-ee5ca25d31984b9768d5ae9419dea0e3b493b479.zip | |
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/").
svn path=/trunk/; revision=4586
Diffstat (limited to 'tethereal.c')
| -rw-r--r-- | tethereal.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tethereal.c b/tethereal.c index a507262ee9..c7081ec11a 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.118 2002/01/15 23:11:02 gram Exp $ + * $Id: tethereal.c,v 1.119 2002/01/21 07:36:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -87,28 +87,28 @@ #endif #include <glib.h> -#include <epan.h> +#include <epan/epan.h> #include "globals.h" -#include "timestamp.h" -#include "packet.h" +#include <epan/timestamp.h> +#include <epan/packet.h> #include "file.h" #include "prefs.h" #include "column.h" #include "print.h" -#include "resolv.h" +#include <epan/resolv.h> #include "util.h" #ifdef HAVE_LIBPCAP #include "pcap-util.h" #endif -#include "conversation.h" +#include <epan/conversation.h> #include "reassemble.h" -#include "plugins.h" +#include <epan/plugins.h> #include "register.h" #include "conditions.h" #include "capture_stop_conditions.h" #include "ringbuffer.h" -#include "epan_dissect.h" +#include <epan/epan_dissect.h> #ifdef WIN32 #include "capture-wpcap.h" |