diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-19 01:37:13 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-19 01:37:13 +0000 |
| commit | 22b7086fb91f059b1c6637cc881ac93fa10fff51 (patch) | |
| tree | 49317a46814db07e2b1760eb5a1eea603572337f /tools | |
| parent | 4a57360291672342936cc66da056b63aa04b2cc5 (diff) | |
We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=44997
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/make-dissector-reg | 4 | ||||
| -rwxr-xr-x | tools/make-dissector-reg.py | 4 | ||||
| -rwxr-xr-x | tools/make-sminmpec.pl | 4 | ||||
| -rwxr-xr-x | tools/ncp2222.py | 4 | ||||
| -rwxr-xr-x | tools/wireshark_gen.py | 4 |
5 files changed, 5 insertions, 15 deletions
diff --git a/tools/make-dissector-reg b/tools/make-dissector-reg index 6bf9a28adf..de486de3e2 100755 --- a/tools/make-dissector-reg +++ b/tools/make-dissector-reg @@ -37,9 +37,7 @@ echo '/* It is created automatically by the Makefile. */'>>${outfile}-tmp if [ "$registertype" = plugin ] then cat <<"EOF" >>${outfile}-tmp -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gmodule.h> diff --git a/tools/make-dissector-reg.py b/tools/make-dissector-reg.py index 01baa0d22b..531a63ddbe 100755 --- a/tools/make-dissector-reg.py +++ b/tools/make-dissector-reg.py @@ -184,9 +184,7 @@ reg_code.write(preamble) # Make the routine to register all protocols if registertype == "plugin" or registertype == "plugin_wtap": reg_code.write(""" -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gmodule.h> diff --git a/tools/make-sminmpec.pl b/tools/make-sminmpec.pl index 97d6c8c6a3..1cc17bea8e 100755 --- a/tools/make-sminmpec.pl +++ b/tools/make-sminmpec.pl @@ -127,9 +127,7 @@ print OUT <<"_SMINMPEC"; * with "(Unknown)" as the name so that direct (indexed) access * to the list is possible. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/tools/ncp2222.py b/tools/ncp2222.py index c784291bc9..2b0ae2dacd 100755 --- a/tools/ncp2222.py +++ b/tools/ncp2222.py @@ -5719,9 +5719,7 @@ def produce_code(): * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <glib.h> diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index 4e398bffb9..db2c2d5772 100755 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -1994,9 +1994,7 @@ static int hf_operationrequest = -1;/* Request_Operation field */ template_Includes = """\ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gmodule.h> |