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/giop | |
| 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/giop')
| -rw-r--r-- | plugins/giop/Makefile.nmake | 4 | ||||
| -rw-r--r-- | plugins/giop/packet-coseventcomm.c | 4 | ||||
| -rw-r--r-- | plugins/giop/packet-cosnaming.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake index a676cc0290..12d6ed1686 100644 --- a/plugins/giop/Makefile.nmake +++ b/plugins/giop/Makefile.nmake @@ -1,12 +1,12 @@ # -# $Id: Makefile.nmake,v 1.4 2001/12/12 01:29:09 guy Exp $ +# $Id: Makefile.nmake,v 1.5 2002/01/21 07:37:46 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/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c index 5d1705c7d3..7eb0e0aac6 100644 --- a/plugins/giop/packet-coseventcomm.c +++ b/plugins/giop/packet-coseventcomm.c @@ -60,8 +60,8 @@ #include <string.h> #include <glib.h> -#include "packet.h" -#include "proto.h" +#include <epan/packet.h> +#include <epan/proto.h> #include "packet-giop.h" #include "plugins/plugin_api_defs.h" diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c index 5bd3a3f115..32282594f9 100644 --- a/plugins/giop/packet-cosnaming.c +++ b/plugins/giop/packet-cosnaming.c @@ -61,8 +61,8 @@ #include <string.h> #include <glib.h> -#include "packet.h" -#include "proto.h" +#include <epan/packet.h> +#include <epan/proto.h> #include "packet-giop.h" #include "plugins/plugin_api_defs.h" |