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 /epan/dfilter/dfilter.h | |
parent | 64c8032c3b617f4be70603e0779905434546a36f (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/").
svn path=/trunk/; revision=4586
Diffstat (limited to 'epan/dfilter/dfilter.h')
-rw-r--r-- | epan/dfilter/dfilter.h | 9 |
1 files changed, 4 insertions, 5 deletions
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 */ |