diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-07-23 08:53:13 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-07-23 08:53:13 +0000 |
| commit | 733bdd4e565f0044daafdc53979fa89748896686 (patch) | |
| tree | 361da54085fc88398cd3a280a7bd331758a5b7f3 /epan | |
| parent | b4a0cda41e0e0626428aacaab54458f25768c34f (diff) | |
Try to get the #includes right - take 2.
svn path=/trunk/; revision=29176
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/column-utils.c | 2 | ||||
| -rw-r--r-- | epan/column_info.h | 3 | ||||
| -rw-r--r-- | epan/dfilter/dfilter.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 2be93bd40c..477b81fd6d 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -29,8 +29,6 @@ #include <string.h> #include <time.h> -#include "dfilter/dfilter.h" - #include "column-utils.h" #include "timestamp.h" #include "sna-utils.h" diff --git a/epan/column_info.h b/epan/column_info.h index 6794e2d7f0..9bae5055ca 100644 --- a/epan/column_info.h +++ b/epan/column_info.h @@ -27,6 +27,9 @@ #include <glib.h> +/* Forward declaration (epan/dfilter/dfilter.h) */ +typedef struct _dfilter_t dfilter_t; + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h index 7951569f23..39e23de28d 100644 --- a/epan/dfilter/dfilter.h +++ b/epan/dfilter/dfilter.h @@ -26,7 +26,9 @@ #include <glib.h> /* Passed back to user */ +#ifndef dfilter_t typedef struct _dfilter_t dfilter_t; +#endif #include <epan/epan.h> #include <epan/proto.h> |