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 /plugins/gryphon | |
parent | 64c8032c3b617f4be70603e0779905434546a36f (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/").
svn path=/trunk/; revision=4586
Diffstat (limited to 'plugins/gryphon')
-rw-r--r-- | plugins/gryphon/Makefile.nmake | 4 | ||||
-rw-r--r-- | plugins/gryphon/packet-gryphon.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake index dad3f4d622..768c014077 100644 --- a/plugins/gryphon/Makefile.nmake +++ b/plugins/gryphon/Makefile.nmake @@ -1,12 +1,12 @@ # -# $Id: Makefile.nmake,v 1.6 2001/12/12 01:29:10 guy Exp $ +# $Id: Makefile.nmake,v 1.7 2002/01/21 07:37:48 guy Exp $ # include ..\..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../epan /I../../wiretap \ +CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \ /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c index fdc451179c..311f8afdf0 100644 --- a/plugins/gryphon/packet-gryphon.c +++ b/plugins/gryphon/packet-gryphon.c @@ -3,7 +3,7 @@ * By Steve Limkemann <stevelim@dgtech.com> * Copyright 1998 Steve Limkemann * - * $Id: packet-gryphon.c,v 1.26 2001/12/10 00:26:20 guy Exp $ + * $Id: packet-gryphon.c,v 1.27 2002/01/21 07:37:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -44,7 +44,7 @@ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif -#include "packet.h" +#include <epan/packet.h> #include "packet-gryphon.h" #include "plugins/plugin_api_defs.h" |