aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal_gen.py
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-01-21 07:52:35 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-01-21 07:52:35 +0000
commit4da371409695a70517e9f0c054162e5aacbd0370 (patch)
tree1299f72d8f03425985df98083a0c130ab8f8020c /ethereal_gen.py
parent5904f05078da51a512d77f38d40d943a300e3e8c (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@4587 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'ethereal_gen.py')
-rw-r--r--ethereal_gen.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ethereal_gen.py b/ethereal_gen.py
index 5a831b83f6..eb5f2f5322 100644
--- a/ethereal_gen.py
+++ b/ethereal_gen.py
@@ -1,6 +1,6 @@
# -*- python -*-
#
-# $Id: ethereal_gen.py,v 1.19 2001/12/19 08:59:06 guy Exp $
+# $Id: ethereal_gen.py,v 1.20 2002/01/21 07:50:24 guy Exp $
#
# ethereal_gen.py (part of idl2eth)
#
@@ -2085,8 +2085,8 @@ for (i_@aname@=0; i_@aname@ < @aval@; i_@aname@++) {
#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "proto.h"
+#include <epan/packet.h>
+#include <epan/proto.h>
#include "packet-giop.h"
#include "plugins/plugin_api_defs.h"