diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-09-28 17:40:07 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-09-28 17:40:07 +0000 |
| commit | 671bb28270c560903f8c5cde16e80ae4de7afca3 (patch) | |
| tree | d372055a3cced49ea08ae4841736d6160716c887 | |
| parent | 99411c8509f4e41b4f6d2cf920ca4021676be4fb (diff) | |
| download | wireshark-671bb28270c560903f8c5cde16e80ae4de7afca3.tar.gz | |
Only include config.h in C files, to avoid multiple inclusion.
svn path=/trunk/; revision=30180
| -rw-r--r-- | epan/funnel.c | 4 | ||||
| -rw-r--r-- | epan/funnel.h | 4 | ||||
| -rw-r--r-- | epan/ptvcursor.h | 4 | ||||
| -rw-r--r-- | tap-funnel.c | 3 |
4 files changed, 7 insertions, 8 deletions
diff --git a/epan/funnel.c b/epan/funnel.c index ccf406894b..83a74afee9 100644 --- a/epan/funnel.c +++ b/epan/funnel.c @@ -26,6 +26,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <epan/funnel.h> typedef struct _funnel_menu_t { diff --git a/epan/funnel.h b/epan/funnel.h index 7a16dcaa31..aa82a3bf35 100644 --- a/epan/funnel.h +++ b/epan/funnel.h @@ -28,10 +28,6 @@ #ifndef _FUNNEL_H #define _FUNNEL_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <glib.h> #include "../stat_menu.h" diff --git a/epan/ptvcursor.h b/epan/ptvcursor.h index d90d8dd8f9..961554dc84 100644 --- a/epan/ptvcursor.h +++ b/epan/ptvcursor.h @@ -27,10 +27,6 @@ #ifndef __PTVCURSOR_H__ #define __PTVCURSOR_H__ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include <glib.h> #include <epan/packet.h> diff --git a/tap-funnel.c b/tap-funnel.c index c06958b672..1353e90469 100644 --- a/tap-funnel.c +++ b/tap-funnel.c @@ -26,6 +26,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <epan/funnel.h> #include <stdio.h> |