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/mgcp | |
| 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/mgcp')
| -rw-r--r-- | plugins/mgcp/Makefile.nmake | 4 | ||||
| -rw-r--r-- | plugins/mgcp/packet-mgcp.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake index a1f12b9cfe..a925755d83 100644 --- a/plugins/mgcp/Makefile.nmake +++ b/plugins/mgcp/Makefile.nmake @@ -1,12 +1,12 @@ # -# $Id: Makefile.nmake,v 1.3 2001/12/12 01:29:11 guy Exp $ +# $Id: Makefile.nmake,v 1.4 2002/01/21 07:37:49 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/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c index 5e09043b42..417c69ee9f 100644 --- a/plugins/mgcp/packet-mgcp.c +++ b/plugins/mgcp/packet-mgcp.c @@ -2,7 +2,7 @@ * Routines for mgcp packet disassembly * RFC 2705 * - * $Id: packet-mgcp.c,v 1.30 2002/01/20 23:25:55 guy Exp $ + * $Id: packet-mgcp.c,v 1.31 2002/01/21 07:37:49 guy Exp $ * * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu> * @@ -47,10 +47,10 @@ #include <ctype.h> #include <time.h> #include <string.h> -#include "packet.h" -#include "resolv.h" +#include <epan/packet.h> +#include <epan/resolv.h> #include "prefs.h" -#include "strutil.h" +#include <epan/strutil.h> #include "plugins/plugin_api_defs.h" |