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 /packet-osi.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 'packet-osi.c')
| -rw-r--r-- | packet-osi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-osi.c b/packet-osi.c index 19ba6144fb..9f74a75309 100644 --- a/packet-osi.c +++ b/packet-osi.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly * Main entrance point and common functions * - * $Id: packet-osi.c,v 1.52 2001/12/10 00:25:31 guy Exp $ + * $Id: packet-osi.c,v 1.53 2002/01/21 07:36:38 guy Exp $ * Laurent Deniel <deniel@worldnet.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * @@ -37,7 +37,7 @@ #include <string.h> #include <ctype.h> #include <glib.h> -#include "packet.h" +#include <epan/packet.h> #include "llcsaps.h" #include "aftypes.h" #include "nlpid.h" |