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

13 files changed, 42 insertions, 51 deletions

diff --git a/epan/dfilter/dfilter-int.h b/epan/dfilter/dfilter-int.h
index 89e1857f8f..1bd2f04754 100644
--- a/epan/dfilter/dfilter-int.h
+++ b/epan/dfilter/dfilter-int.h
@@ -1,10 +1,9 @@
 /*
- * $Id: dfilter-int.h,v 1.4 2001/12/18 19:09:06 gram Exp $
+ * $Id: dfilter-int.h,v 1.5 2002/01/21 07:37:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -27,7 +26,7 @@
 #include "dfilter.h"
 #include "syntax-tree.h"
 
-#include "proto.h"
+#include <epan/proto.h>
 
 /* Passed back to user */
 struct _dfilter_t {
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index 1f5743d23e..8c4aacbe7f 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@@ -1,10 +1,9 @@
 /*
- * $Id: dfilter.c,v 1.6 2001/12/18 19:09:06 gram Exp $
+ * $Id: dfilter.c,v 1.7 2002/01/21 07:37:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -37,7 +36,7 @@
 #include "gencode.h"
 #include "semcheck.h"
 #include "dfvm.h"
-#include "epan_dissect.h"
+#include <epan/epan_dissect.h>
 
 
 /* Balanced tree of abbreviations and IDs */
diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h
index 49eba9c5db..aa6ef4321e 100644
--- a/epan/dfilter/dfilter.h
+++ b/epan/dfilter/dfilter.h
@@ -1,10 +1,9 @@
 /*
- * $Id: dfilter.h,v 1.3 2001/12/18 19:09:06 gram Exp $
+ * $Id: dfilter.h,v 1.4 2002/01/21 07:37:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,8 +28,8 @@
 /* Passed back to user */
 typedef struct _dfilter_t dfilter_t;
 
-#include "epan.h"
-#include "proto.h"
+#include <epan/epan.h>
+#include <epan/proto.h>
 
 
 /* Module-level initialization */
diff --git a/epan/dfilter/dfvm.h b/epan/dfilter/dfvm.h
index c4b00c655c..954027626c 100644
--- a/epan/dfilter/dfvm.h
+++ b/epan/dfilter/dfvm.h
@@ -1,10 +1,9 @@
 /*
- * $Id: dfvm.h,v 1.3 2001/02/27 19:23:28 gram Exp $
+ * $Id: dfvm.h,v 1.4 2002/01/21 07:37:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,7 +24,7 @@
 #define DFVM_H
 
 #include <stdio.h>
-#include "proto.h"
+#include <epan/proto.h>
 #include "dfilter-int.h"
 #include "syntax-tree.h"
 #include "drange.h"
diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c
index d8d0119005..985a38a7e9 100644
--- a/epan/dfilter/gencode.c
+++ b/epan/dfilter/gencode.c
@@ -1,10 +1,9 @@
 /*
- * $Id: gencode.c,v 1.4 2001/12/18 19:09:06 gram Exp $
+ * $Id: gencode.c,v 1.5 2002/01/21 07:37:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -31,7 +30,7 @@
 #include "sttype-range.h"
 #include "sttype-test.h"
 #include "ftypes/ftypes.h"
-#include "gdebug.h"
+#include <epan/gdebug.h>
 
 static void
 gencode(dfwork_t *dfw, stnode_t *st_node);
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 5afb7b6b0a..4871507c50 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -1,5 +1,5 @@
 /*
- * $Id: semcheck.c,v 1.7 2001/12/18 19:09:06 gram Exp $
+ * $Id: semcheck.c,v 1.8 2002/01/21 07:37:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -31,8 +31,8 @@
 #include "sttype-range.h"
 #include "sttype-test.h"
 
-#include "exceptions.h"
-#include "packet.h"
+#include <epan/exceptions.h>
+#include <epan/packet.h>
 
 static void
 semcheck(dfwork_t *dfw, stnode_t *st_node);
diff --git a/epan/dfilter/sttype-range.c b/epan/dfilter/sttype-range.c
index 1195223eb1..79c4094f22 100644
--- a/epan/dfilter/sttype-range.c
+++ b/epan/dfilter/sttype-range.c
@@ -1,10 +1,9 @@
 /*
- * $Id: sttype-range.c,v 1.3 2001/02/27 19:23:28 gram Exp $
+ * $Id: sttype-range.c,v 1.4 2002/01/21 07:37:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,7 +31,7 @@
 
 #include <glib.h>
 
-#include "proto.h"
+#include <epan/proto.h>
 #include "drange.h"
 #include "sttype-range.h"
 
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index 63c7327501..facd917635 100644
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: ftype-bytes.c,v 1.8 2001/11/22 03:07:07 hagbard Exp $
+ * $Id: ftype-bytes.c,v 1.9 2002/01/21 07:37:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -27,8 +27,8 @@
 #include <ftypes-int.h>
 #include <string.h>
 #include <ctype.h>
-#include "resolv.h"
-#include "int-64bit.h"
+#include <epan/resolv.h>
+#include <epan/int-64bit.h>
 
 #define ETHER_LEN	6
 #define IPv6_LEN	16
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index fcfd996e97..08c22f6142 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -1,10 +1,9 @@
 /*
- * $Id: ftype-integer.c,v 1.6 2001/07/13 00:55:56 guy Exp $
+ * $Id: ftype-integer.c,v 1.7 2002/01/21 07:37:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -33,7 +32,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include "ftypes-int.h"
-#include "resolv.h"
+#include <epan/resolv.h>
 
 
 static void
diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c
index 0037923a92..7ab297e3a5 100644
--- a/epan/ftypes/ftype-ipv4.c
+++ b/epan/ftypes/ftype-ipv4.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ftype-ipv4.c,v 1.6 2001/07/13 00:55:56 guy Exp $
+ * $Id: ftype-ipv4.c,v 1.7 2002/01/21 07:37:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -27,8 +27,8 @@
 #include <string.h>
 
 #include <ftypes-int.h>
-#include "ipv4.h"
-#include "resolv.h"
+#include <epan/ipv4.h>
+#include <epan/resolv.h>
 
 
 static void
diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c
index 97e3fa7ed2..1fd9abad2a 100644
--- a/epan/ftypes/ftype-tvbuff.c
+++ b/epan/ftypes/ftype-tvbuff.c
@@ -1,10 +1,9 @@
 /*
- * $Id: ftype-tvbuff.c,v 1.5 2001/03/13 21:34:28 gram Exp $
+ * $Id: ftype-tvbuff.c,v 1.6 2002/01/21 07:37:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,7 +25,7 @@
 #endif
 
 #include <ftypes-int.h>
-#include "gdebug.h"
+#include <epan/gdebug.h>
 
 static void
 value_new(fvalue_t *fv)
diff --git a/epan/ftypes/ftypes-int.h b/epan/ftypes/ftypes-int.h
index 32b4152310..f67297c5f2 100644
--- a/epan/ftypes/ftypes-int.h
+++ b/epan/ftypes/ftypes-int.h
@@ -1,10 +1,9 @@
 /*
- * $Id: ftypes-int.h,v 1.4 2001/03/02 17:17:56 gram Exp $
+ * $Id: ftypes-int.h,v 1.5 2002/01/21 07:37:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 2001 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,7 +23,7 @@
 #ifndef FTYPES_INT_H
 #define FTYPES_INT_H
 
-#include "packet.h"
+#include <epan/packet.h>
 #include "ftypes.h"
 
 typedef void (*FvalueNewFunc)(fvalue_t*);
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h
index 0bf117944a..a713ef7c2b 100644
--- a/epan/ftypes/ftypes.h
+++ b/epan/ftypes/ftypes.h
@@ -1,7 +1,7 @@
 /* ftypes.h
  * Definitions for field types
  *
- * $Id: ftypes.h,v 1.7 2001/11/02 10:09:51 guy Exp $
+ * $Id: ftypes.h,v 1.8 2002/01/21 07:37:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -112,15 +112,15 @@ ftype_can_le(enum ftenum ftype);
 
 /* ---------------- FVALUE ----------------- */
 
-#include "ipv4.h"
+#include <epan/ipv4.h>
 
 #ifdef HAVE_WINSOCK_H
 #include <winsock.h>
 #endif
 
-#include "tvbuff.h"
-#include "nstime.h"
-#include "dfilter/drange.h"
+#include <epan/tvbuff.h>
+#include <epan/nstime.h>
+#include <epan/dfilter/drange.h>
 
 typedef struct {
 	ftype_t	*ftype;