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.h | |
| parent | 64c8032c3b617f4be70603e0779905434546a36f (diff) | |
| download | wireshark-ee5ca25d31984b9768d5ae9419dea0e3b493b479.tar.gz | |
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.h')
| -rw-r--r-- | packet-osi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-osi.h b/packet-osi.h index 6b2573526f..7dc1688d36 100644 --- a/packet-osi.h +++ b/packet-osi.h @@ -1,6 +1,6 @@ /* packet-osi.h * - * $Id: packet-osi.h,v 1.8 2001/06/05 09:06:19 guy Exp $ + * $Id: packet-osi.h,v 1.9 2002/01/21 07:36:38 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -24,7 +24,7 @@ #ifndef _PACKET_OSI_H #define _PACKET_OSI_H -#include "osi-utils.h" +#include <epan/osi-utils.h> #define PDU_TYPE_ESIS_ESH 100 #define PDU_TYPE_ESIS_ISH 101 |