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-osi-options.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-osi-options.c')
| -rw-r--r-- | packet-osi-options.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packet-osi-options.c b/packet-osi-options.c index 0f654a5d12..43640850ec 100644 --- a/packet-osi-options.c +++ b/packet-osi-options.c @@ -5,13 +5,12 @@ * ISO 10589 ISIS (Intradomain Routing Information Exchange Protocol) * ISO 9542 ESIS (End System To Intermediate System Routing Exchange Protocol) * - * $Id: packet-osi-options.c,v 1.8 2001/08/13 00:56:18 sharpe Exp $ + * $Id: packet-osi-options.c,v 1.9 2002/01/21 07:36:38 guy Exp $ * Ralf Schneider <Ralf.Schneider@t-online.de> * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -41,7 +40,7 @@ #include <stdio.h> #include <string.h> #include <glib.h> -#include "packet.h" +#include <epan/packet.h> #include "nlpid.h" #include "packet-osi.h" #include "packet-isis.h" |