diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-01-21 07:37:49 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-01-21 07:37:49 +0000 |
commit | 5904f05078da51a512d77f38d40d943a300e3e8c (patch) | |
tree | 8bf88b7d322dbff0c32339f1136ea77ad7dda975 /packet-fr.c | |
parent | 0d9b33da275ff33df0d8ed48816257398376c42b (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/").
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4586 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-fr.c')
-rw-r--r-- | packet-fr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-fr.c b/packet-fr.c index 93d5e48764..44e1209fa1 100644 --- a/packet-fr.c +++ b/packet-fr.c @@ -3,7 +3,7 @@ * * Copyright 2001, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-fr.c,v 1.27 2001/12/10 00:25:27 guy Exp $ + * $Id: packet-fr.c,v 1.28 2002/01/21 07:36:34 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -44,7 +44,7 @@ #include <string.h> #include <glib.h> -#include "packet.h" +#include <epan/packet.h> #include "packet-osi.h" #include "packet-llc.h" #include "packet-chdlc.h" @@ -53,7 +53,7 @@ #include "oui.h" #include "nlpid.h" #include "greproto.h" -#include "conversation.h" +#include <epan/conversation.h> /* * Bits in the address field. |