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

1 files changed, 8 insertions, 8 deletions

diff --git a/dftest.c b/dftest.c
index 7556d77360..fa7e0aac2f 100644
--- a/dftest.c
+++ b/dftest.c
@@ -1,9 +1,9 @@
 /* dftest.c.c
  *
- * $Id: dftest.c,v 1.2 2001/04/02 00:38:33 hagbard Exp $
+ * $Id: dftest.c,v 1.3 2002/01/21 07:36:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
  * Shows display filter byte-code, for debugging dfilter routines.
@@ -65,19 +65,19 @@
 #endif
 
 #include <glib.h>
-#include <epan.h>
+#include <epan/epan.h>
 
 #if 0
 #include "globals.h"
-#include "packet.h"
+#include <epan/packet.h>
 #include "file.h"
 #include "column.h"
 #include "print.h"
-#include "resolv.h"
-#include "conversation.h"
+#include <epan/resolv.h>
+#include <epan/conversation.h>
 #endif
-#include "timestamp.h"
-#include "plugins.h"
+#include <epan/timestamp.h>
+#include <epan/plugins.h>
 #include "prefs.h"
 #include "util.h"
 #include "epan/dfilter/dfilter.h"