diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-20 01:29:52 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-20 01:29:52 +0000 |
| commit | 3551a86c36fa9f27dede601320a812d2ce0ae941 (patch) | |
| tree | c74c0f93eaeda6f2bc7f09898a85431eea7e381b | |
| parent | 3e05236eff6c7f3638f7a1b94ca9a1f398e673a1 (diff) | |
We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45015
379 files changed, 219 insertions, 977 deletions
diff --git a/airpcap_loader.c b/airpcap_loader.c index e22fecad76..d2bb93b0db 100644 --- a/airpcap_loader.c +++ b/airpcap_loader.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_AIRPCAP diff --git a/asn1/HI2Operations/packet-HI2Operations-template.c b/asn1/HI2Operations/packet-HI2Operations-template.c index 7da8376e1c..a81fe3e439 100644 --- a/asn1/HI2Operations/packet-HI2Operations-template.c +++ b/asn1/HI2Operations/packet-HI2Operations-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c index 5f68e53f58..7306943631 100644 --- a/asn1/acp133/packet-acp133-template.c +++ b/asn1/acp133/packet-acp133-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c index 5d9141d509..638e502926 100644 --- a/asn1/acse/packet-acse-template.c +++ b/asn1/acse/packet-acse-template.c @@ -34,9 +34,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index d15c150073..af90f980cd 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -84,9 +84,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.c b/asn1/ansi_tcap/packet-ansi_tcap-template.c index 31923d8586..f7b52ef5b7 100644 --- a/asn1/ansi_tcap/packet-ansi_tcap-template.c +++ b/asn1/ansi_tcap/packet-ansi_tcap-template.c @@ -24,9 +24,7 @@ * References: T1.114 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c index 5ac16d05bf..893ffdbb66 100644 --- a/asn1/c1222/packet-c1222-template.c +++ b/asn1/c1222/packet-c1222-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/conversation.h> diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index 60e543f03c..327b2ebb81 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -33,9 +33,7 @@ * Indentation logic: this file is indented with 2 spaces indentation. * there are no tabs. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/cdt/packet-cdt-template.c b/asn1/cdt/packet-cdt-template.c index 2e57b1b33b..a5c6edd5b5 100644 --- a/asn1/cdt/packet-cdt-template.c +++ b/asn1/cdt/packet-cdt-template.c @@ -27,9 +27,7 @@ * Ref: STANAG 4406 Annex E */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> #include <epan/oids.h> diff --git a/asn1/charging_ase/packet-charging_ase-template.c b/asn1/charging_ase/packet-charging_ase-template.c index 1d80b6f9d4..f56420f0af 100644 --- a/asn1/charging_ase/packet-charging_ase-template.c +++ b/asn1/charging_ase/packet-charging_ase-template.c @@ -23,9 +23,7 @@ * References: ETSI ES 201 296 V1.3.1 (2003-04) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index e8cc98ddca..d554320c43 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c index f0712d4621..8a8f39ec52 100644 --- a/asn1/cmp/packet-cmp-template.c +++ b/asn1/cmp/packet-cmp-template.c @@ -26,9 +26,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index af51568c8a..01efb52f86 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/credssp/packet-credssp-template.c b/asn1/credssp/packet-credssp-template.c index dc9dbee99e..7fc7c8dcff 100644 --- a/asn1/credssp/packet-credssp-template.c +++ b/asn1/credssp/packet-credssp-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/crmf/packet-crmf-template.c b/asn1/crmf/packet-crmf-template.c index b9ed804565..70c0f8d10b 100644 --- a/asn1/crmf/packet-crmf-template.c +++ b/asn1/crmf/packet-crmf-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c index bb25e783eb..7ec11097ed 100644 --- a/asn1/dap/packet-dap-template.c +++ b/asn1/dap/packet-dap-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c index baed275887..b9224fc91f 100644 --- a/asn1/disp/packet-disp-template.c +++ b/asn1/disp/packet-disp-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c index 1973a93d40..f88584c20c 100644 --- a/asn1/dop/packet-dop-template.c +++ b/asn1/dop/packet-dop-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c index 18e491a7ad..77187b1f10 100644 --- a/asn1/dsp/packet-dsp-template.c +++ b/asn1/dsp/packet-dsp-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/ess/packet-ess-template.c b/asn1/ess/packet-ess-template.c index 68dbc76ad0..96fa4d2a8f 100644 --- a/asn1/ess/packet-ess-template.c +++ b/asn1/ess/packet-ess-template.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <string.h> diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index f36f1b3abe..0fbda4a2e0 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -28,9 +28,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/gnm/packet-gnm-template.c b/asn1/gnm/packet-gnm-template.c index b3118b2b39..91c6a273f6 100644 --- a/asn1/gnm/packet-gnm-template.c +++ b/asn1/gnm/packet-gnm-template.c @@ -27,9 +27,7 @@ * ITU-T recommendatiom M.3100 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/goose/packet-goose-template.c b/asn1/goose/packet-goose-template.c index 246a6a1a4b..99c44a0585 100644 --- a/asn1/goose/packet-goose-template.c +++ b/asn1/goose/packet-goose-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/gprscdr/packet-gprscdr-template.c b/asn1/gprscdr/packet-gprscdr-template.c index def2844177..cbe0122646 100644 --- a/asn1/gprscdr/packet-gprscdr-template.c +++ b/asn1/gprscdr/packet-gprscdr-template.c @@ -23,9 +23,7 @@ * References: 3GPP TS 32.298 */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c index 81773a31c0..118ca70c3f 100644 --- a/asn1/gsm_map/packet-gsm_map-template.c +++ b/asn1/gsm_map/packet-gsm_map-template.c @@ -44,9 +44,7 @@ * References: 3GPP TS 24.080 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index f0b47ef500..7c0c395d59 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -32,9 +32,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c index 8a927520b6..55137f0952 100644 --- a/asn1/h235/packet-h235-template.c +++ b/asn1/h235/packet-h235-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index 6888e5a16d..b9ab74fe63 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -32,9 +32,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index 45e0a10a44..4fb53e8e93 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "packet-h248.h" #include <epan/tap.h> diff --git a/asn1/h282/packet-h282-template.c b/asn1/h282/packet-h282-template.c index c97ab9699a..4191e93d33 100644 --- a/asn1/h282/packet-h282-template.c +++ b/asn1/h282/packet-h282-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/h283/packet-h283-template.c b/asn1/h283/packet-h283-template.c index 635a0d89d0..05a946dcb1 100644 --- a/asn1/h283/packet-h283-template.c +++ b/asn1/h283/packet-h283-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/h323/packet-h323-template.c b/asn1/h323/packet-h323-template.c index fc70ca39a1..0a243d7cd6 100644 --- a/asn1/h323/packet-h323-template.c +++ b/asn1/h323/packet-h323-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/h450-ros/packet-h450-ros-template.c b/asn1/h450-ros/packet-h450-ros-template.c index 31aec2b35a..b9f326279d 100644 --- a/asn1/h450-ros/packet-h450-ros-template.c +++ b/asn1/h450-ros/packet-h450-ros-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/strutil.h> diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c index 5550669f02..d98a1e2d5b 100644 --- a/asn1/h450/packet-h450-template.c +++ b/asn1/h450/packet-h450-template.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/h460/packet-h460-template.c b/asn1/h460/packet-h460-template.c index ed47573e9f..53d9aca845 100644 --- a/asn1/h460/packet-h460-template.c +++ b/asn1/h460/packet-h460-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/h501/packet-h501-template.c b/asn1/h501/packet-h501-template.c index e606ae3fc3..93a170806b 100644 --- a/asn1/h501/packet-h501-template.c +++ b/asn1/h501/packet-h501-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/hnbap/packet-hnbap-template.c b/asn1/hnbap/packet-hnbap-template.c index acc91c13c3..914720b73e 100644 --- a/asn1/hnbap/packet-hnbap-template.c +++ b/asn1/hnbap/packet-hnbap-template.c @@ -25,9 +25,7 @@ * Ref: 3GPP TS 25.469 version 8.4.0 Release 8 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <string.h> diff --git a/asn1/idmp/packet-idmp-template.c b/asn1/idmp/packet-idmp-template.c index 56d9ef8936..a02cd5ae25 100644 --- a/asn1/idmp/packet-idmp-template.c +++ b/asn1/idmp/packet-idmp-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c index 0bd2b19ce0..921ebfbe0a 100644 --- a/asn1/inap/packet-inap-template.c +++ b/asn1/inap/packet-inap-template.c @@ -25,9 +25,7 @@ * ITU Q.1218 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index cb8c42dd28..d53c6e5a08 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -54,9 +54,7 @@ * information. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/asn1/lcsap/packet-lcsap-template.c b/asn1/lcsap/packet-lcsap-template.c index f877739452..9d3baf6eaf 100644 --- a/asn1/lcsap/packet-lcsap-template.c +++ b/asn1/lcsap/packet-lcsap-template.c @@ -26,9 +26,7 @@ * ETSI TS 129 171 V9.2.0 (2010-10) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 005178f318..76cbda7020 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -82,9 +82,7 @@ * Mathieu Parent <math.parent@gmail.com> */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <ctype.h> diff --git a/asn1/logotypecertextn/packet-logotypecertextn-template.c b/asn1/logotypecertextn/packet-logotypecertextn-template.c index 9b77e4ee30..624e9c1a4a 100644 --- a/asn1/logotypecertextn/packet-logotypecertextn-template.c +++ b/asn1/logotypecertextn/packet-logotypecertextn-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/lpp/packet-lpp-template.c b/asn1/lpp/packet-lpp-template.c index 0880fcd74d..f0dc78f157 100644 --- a/asn1/lpp/packet-lpp-template.c +++ b/asn1/lpp/packet-lpp-template.c @@ -26,9 +26,7 @@ * http://www.3gpp.org */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/lppa/packet-lppa-template.c b/asn1/lppa/packet-lppa-template.c index a6e8d6eee0..e218c4d5b2 100644 --- a/asn1/lppa/packet-lppa-template.c +++ b/asn1/lppa/packet-lppa-template.c @@ -26,9 +26,7 @@ * http://www.3gpp.org */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/lppe/packet-lppe-template.c b/asn1/lppe/packet-lppe-template.c index a129e593b3..c89252128f 100644 --- a/asn1/lppe/packet-lppe-template.c +++ b/asn1/lppe/packet-lppe-template.c @@ -25,9 +25,7 @@ * Ref Open Mobile Alliance OMA-TS-LPPe V1_0-20110929-C */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c index ad38a288ca..4cd4bb93c1 100644 --- a/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/asn1/lte-rrc/packet-lte-rrc-template.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/m3ap/packet-m3ap-template.c b/asn1/m3ap/packet-m3ap-template.c index 7dbf044a88..74aadac31a 100644 --- a/asn1/m3ap/packet-m3ap-template.c +++ b/asn1/m3ap/packet-m3ap-template.c @@ -24,9 +24,7 @@ * Reference: 3GPP TS 36.444 v11.0.0 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c index 32457f18fd..8bea578a46 100644 --- a/asn1/mms/packet-mms-template.c +++ b/asn1/mms/packet-mms-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/prefs.h> diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index 7298a0401a..ae2b9b673f 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c index 25fe7647fd..82f917ef44 100644 --- a/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index af240d62e6..5e018a58bb 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -25,9 +25,7 @@ * Ref: 3GPP TS 25.433 version 6.6.0 Release 6 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/asn1/ns_cert_exts/packet-ns_cert_exts-template.c b/asn1/ns_cert_exts/packet-ns_cert_exts-template.c index 7d332ce59c..459f69bbfd 100644 --- a/asn1/ns_cert_exts/packet-ns_cert_exts-template.c +++ b/asn1/ns_cert_exts/packet-ns_cert_exts-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c index c41a82c89e..964ac88f2a 100644 --- a/asn1/ocsp/packet-ocsp-template.c +++ b/asn1/ocsp/packet-ocsp-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c index ce0104f3f7..d65380f511 100644 --- a/asn1/p1/packet-p1-template.c +++ b/asn1/p1/packet-p1-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/p22/packet-p22-template.c b/asn1/p22/packet-p22-template.c index 56213ab5f8..6c9a1ee97e 100644 --- a/asn1/p22/packet-p22-template.c +++ b/asn1/p22/packet-p22-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/p7/packet-p7-template.c b/asn1/p7/packet-p7-template.c index e4b8cc83fc..15d5c6c1fc 100644 --- a/asn1/p7/packet-p7-template.c +++ b/asn1/p7/packet-p7-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/p772/packet-p772-template.c b/asn1/p772/packet-p772-template.c index 2acfb97849..4783089588 100644 --- a/asn1/p772/packet-p772-template.c +++ b/asn1/p772/packet-p772-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/pcap/packet-pcap-template.c b/asn1/pcap/packet-pcap-template.c index 0daa7765d1..579cc93b88 100644 --- a/asn1/pcap/packet-pcap-template.c +++ b/asn1/pcap/packet-pcap-template.c @@ -28,9 +28,7 @@ * References: ETSI TS 125 453 V7.9.0 (2008-02) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/pkcs1/packet-pkcs1-template.c b/asn1/pkcs1/packet-pkcs1-template.c index a865c668ac..4ad0ae0f0a 100644 --- a/asn1/pkcs1/packet-pkcs1-template.c +++ b/asn1/pkcs1/packet-pkcs1-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index f7a4fd4200..6b19d89a99 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/pkinit/packet-pkinit-template.c b/asn1/pkinit/packet-pkinit-template.c index aaddf318e3..6b54bf47ec 100644 --- a/asn1/pkinit/packet-pkinit-template.c +++ b/asn1/pkinit/packet-pkinit-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/pkix1explicit/packet-pkix1explicit-template.c b/asn1/pkix1explicit/packet-pkix1explicit-template.c index 80a708ba2e..20af7b365e 100644 --- a/asn1/pkix1explicit/packet-pkix1explicit-template.c +++ b/asn1/pkix1explicit/packet-pkix1explicit-template.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/pkix1implicit/packet-pkix1implicit-template.c b/asn1/pkix1implicit/packet-pkix1implicit-template.c index abc1b4c5ef..1874428343 100644 --- a/asn1/pkix1implicit/packet-pkix1implicit-template.c +++ b/asn1/pkix1implicit/packet-pkix1implicit-template.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/pkixac/packet-pkixac-template.c b/asn1/pkixac/packet-pkixac-template.c index c4892f1f80..4841f2a106 100644 --- a/asn1/pkixac/packet-pkixac-template.c +++ b/asn1/pkixac/packet-pkixac-template.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/pkixproxy/packet-pkixproxy-template.c b/asn1/pkixproxy/packet-pkixproxy-template.c index dc1a9be867..960024ce65 100644 --- a/asn1/pkixproxy/packet-pkixproxy-template.c +++ b/asn1/pkixproxy/packet-pkixproxy-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/pkixqualified/packet-pkixqualified-template.c b/asn1/pkixqualified/packet-pkixqualified-template.c index 202d155151..f74afaa2f8 100644 --- a/asn1/pkixqualified/packet-pkixqualified-template.c +++ b/asn1/pkixqualified/packet-pkixqualified-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c index 6687a795b2..712ae14392 100644 --- a/asn1/pkixtsp/packet-pkixtsp-template.c +++ b/asn1/pkixtsp/packet-pkixtsp-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c index 9ae69ddf7d..059c75dc36 100644 --- a/asn1/pres/packet-pres-template.c +++ b/asn1/pres/packet-pres-template.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/q932-ros/packet-q932-ros-template.c b/asn1/q932-ros/packet-q932-ros-template.c index e1c289885d..4174f97947 100644 --- a/asn1/q932-ros/packet-q932-ros-template.c +++ b/asn1/q932-ros/packet-q932-ros-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/strutil.h> diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c index 84e1b0264b..cd36ff1d8d 100644 --- a/asn1/q932/packet-q932-template.c +++ b/asn1/q932/packet-q932-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/strutil.h> diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c index b40882fe29..a2328d5a69 100644 --- a/asn1/qsig/packet-qsig-template.c +++ b/asn1/qsig/packet-qsig-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/strutil.h> diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index eec789f944..49965c937e 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -25,9 +25,7 @@ * References: 3GPP TS 25.413 version 10.4.0 Release 10 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c index a22c922b8d..992e209122 100644 --- a/asn1/rnsap/packet-rnsap-template.c +++ b/asn1/rnsap/packet-rnsap-template.c @@ -28,9 +28,7 @@ * Ref: 3GPP TS 25.423 version 6.7.0 Release 6 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c index 3e6f3dc4fb..e00b348384 100644 --- a/asn1/ros/packet-ros-template.c +++ b/asn1/ros/packet-ros-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c index 006d0aa77d..d6fc15e84b 100644 --- a/asn1/rrc/packet-rrc-template.c +++ b/asn1/rrc/packet-rrc-template.c @@ -33,9 +33,7 @@ * - Fix ciphering information for circuit switched stuff */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/rrlp/packet-rrlp-template.c b/asn1/rrlp/packet-rrlp-template.c index 366c1ab4a4..3a184083e9 100644 --- a/asn1/rrlp/packet-rrlp-template.c +++ b/asn1/rrlp/packet-rrlp-template.c @@ -26,9 +26,7 @@ * http://www.3gpp.org */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index 88c3398485..37c704d474 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/rua/packet-rua-template.c b/asn1/rua/packet-rua-template.c index cd7bff13d3..aff18ad609 100644 --- a/asn1/rua/packet-rua-template.c +++ b/asn1/rua/packet-rua-template.c @@ -25,9 +25,7 @@ * Ref: 3GPP TS 25.468 version 8.1.0 Release 8 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <string.h> diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c index 661fea0a07..49be4e24a5 100644 --- a/asn1/s1ap/packet-s1ap-template.c +++ b/asn1/s1ap/packet-s1ap-template.c @@ -27,9 +27,7 @@ * References: 3GPP TS 36.413 V9.2.0 (2010-03) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c index c2c35af8d1..724639dc6e 100644 --- a/asn1/sabp/packet-sabp-template.c +++ b/asn1/sabp/packet-sabp-template.c @@ -25,9 +25,7 @@ * Ref: 3GPP TS 25.419 version V9.0.0 (2009-12) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/sbc-ap/packet-sbc-ap-template.c b/asn1/sbc-ap/packet-sbc-ap-template.c index 0c5378b5b3..b79cd824c4 100644 --- a/asn1/sbc-ap/packet-sbc-ap-template.c +++ b/asn1/sbc-ap/packet-sbc-ap-template.c @@ -24,9 +24,7 @@ * Ref 3GPP TS 29.168 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/smrse/packet-smrse-template.c b/asn1/smrse/packet-smrse-template.c index faadd96265..934ca69916 100644 --- a/asn1/smrse/packet-smrse-template.c +++ b/asn1/smrse/packet-smrse-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index 5a207a5099..f926eb7bb3 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -46,9 +46,7 @@ #define D(args) do {printf args; fflush(stdout); } while(0) -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <ctype.h> diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index f1d5419b32..7d516f4a4e 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -31,9 +31,7 @@ Heimdal 1.6 and has been modified for wireshark's requirements. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/sv/packet-sv-template.c b/asn1/sv/packet-sv-template.c index a35f59779a..02f3b5fa76 100644 --- a/asn1/sv/packet-sv-template.c +++ b/asn1/sv/packet-sv-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c index 7b174b3cff..5d567c871b 100644 --- a/asn1/t124/packet-t124-template.c +++ b/asn1/t124/packet-t124-template.c @@ -24,9 +24,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c index 7593875f27..3ab39a4d9b 100644 --- a/asn1/t125/packet-t125-template.c +++ b/asn1/t125/packet-t125-template.c @@ -24,9 +24,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index 5b332b377e..f72fe6d5b4 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -44,9 +44,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c index faaf0ba55c..ba0cebd0ed 100644 --- a/asn1/tcap/packet-tcap-template.c +++ b/asn1/tcap/packet-tcap-template.c @@ -25,9 +25,7 @@ * References: ETSI 300 374 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/tetra/packet-tetra-template.c b/asn1/tetra/packet-tetra-template.c index 6e173cc133..3022e64385 100644 --- a/asn1/tetra/packet-tetra-template.c +++ b/asn1/tetra/packet-tetra-template.c @@ -28,9 +28,7 @@ * REF: ETSI EN 300 392-2 V3.2.1 */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c index 4a5dee9eaa..503aaa5757 100644 --- a/asn1/ulp/packet-ulp-template.c +++ b/asn1/ulp/packet-ulp-template.c @@ -26,9 +26,7 @@ * http://www.openmobilealliance.org */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/wlancertextn/packet-wlancertextn-template.c b/asn1/wlancertextn/packet-wlancertextn-template.c index 60beebb97b..0b1731882f 100644 --- a/asn1/wlancertextn/packet-wlancertextn-template.c +++ b/asn1/wlancertextn/packet-wlancertextn-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c index f8377933f0..313425553a 100644 --- a/asn1/x2ap/packet-x2ap-template.c +++ b/asn1/x2ap/packet-x2ap-template.c @@ -28,9 +28,7 @@ * 3GPP TS 36.423 V9.2.0 (2010-03) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index 977bd05752..bb0c259acc 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c index 0f7121b3d9..a45427fef8 100644 --- a/asn1/x509ce/packet-x509ce-template.c +++ b/asn1/x509ce/packet-x509ce-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c index 4a79bed10d..c88da2d820 100644 --- a/asn1/x509if/packet-x509if-template.c +++ b/asn1/x509if/packet-x509if-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index e093fb26dd..1f91786e87 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/capinfos.c b/capinfos.c index 34888e96df..a799be22bf 100644 --- a/capinfos.c +++ b/capinfos.c @@ -56,9 +56,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> diff --git a/capture-pcap-util-unix.c b/capture-pcap-util-unix.c index 59ae2477bc..0e094b1add 100644 --- a/capture-pcap-util-unix.c +++ b/capture-pcap-util-unix.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/capture-pcap-util.c b/capture-pcap-util.c index 57b0052337..4ed06b38ad 100644 --- a/capture-pcap-util.c +++ b/capture-pcap-util.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_LIBPCAP diff --git a/capture-wpcap.c b/capture-wpcap.c index bb5e50222d..a651dd0bf6 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <glib.h> @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_LIBPCAP diff --git a/capture_ifinfo.c b/capture_ifinfo.c index c9c03a1374..f96974591d 100644 --- a/capture_ifinfo.c +++ b/capture_ifinfo.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_LIBPCAP diff --git a/capture_info.c b/capture_info.c index 27fd1a6581..059269c63a 100644 --- a/capture_info.c +++ b/capture_info.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_LIBPCAP diff --git a/capture_opts.c b/capture_opts.c index c70d42d0d8..5f32a4286d 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_LIBPCAP diff --git a/capture_stop_conditions.c b/capture_stop_conditions.c index cc163659d0..debf9f9247 100644 --- a/capture_stop_conditions.c +++ b/capture_stop_conditions.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <time.h> #include <string.h> diff --git a/capture_sync.c b/capture_sync.c index 57f4ba67e8..d7afd422d1 100644 --- a/capture_sync.c +++ b/capture_sync.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_LIBPCAP diff --git a/capture_ui_utils.c b/capture_ui_utils.c index 7e3f680660..9c019711ad 100644 --- a/capture_ui_utils.c +++ b/capture_ui_utils.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_LIBPCAP diff --git a/capture_wpcap_packet.c b/capture_wpcap_packet.c index a28a32fcc0..63eada2b4c 100644 --- a/capture_wpcap_packet.c +++ b/capture_wpcap_packet.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #if defined HAVE_LIBPCAP && defined _WIN32 @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/clopts_common.c b/clopts_common.c index 1c482083d4..0e8c0cf978 100644 --- a/clopts_common.c +++ b/clopts_common.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/color_filters.c b/color_filters.c index 5c83cb59cc..36ee79ae29 100644 --- a/color_filters.c +++ b/color_filters.c @@ -25,9 +25,7 @@ * Updated 1 Dec 10 jjm */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/conditions.c b/conditions.c index e426ab7e88..ac7963cc7d 100644 --- a/conditions.c +++ b/conditions.c @@ -22,9 +22,7 @@ * 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 <stdlib.h> @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> #include <stdio.h> diff --git a/disabled_protos.c b/disabled_protos.c index 4920650516..b85f1ed770 100644 --- a/disabled_protos.c +++ b/disabled_protos.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> @@ -21,9 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <stdlib.h> /* for exit() */ @@ -8,9 +8,7 @@ * Further improved by Richard Sharpe. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/frame_data_sequence.c b/frame_data_sequence.c index d6f934d237..e8cfa973ed 100644 --- a/frame_data_sequence.c +++ b/frame_data_sequence.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> @@ -7,9 +7,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> diff --git a/mergecap.c b/mergecap.c index 4f9869d029..8ebed8789e 100644 --- a/mergecap.c +++ b/mergecap.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> diff --git a/packet-range.c b/packet-range.c index 6914fda2b7..688f75158d 100644 --- a/packet-range.c +++ b/packet-range.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <string.h> @@ -40,9 +40,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_LIBPCAP diff --git a/plugins/asn1/asn1.c b/plugins/asn1/asn1.c index d2a91602a8..39d9e0d660 100644 --- a/plugins/asn1/asn1.c +++ b/plugins/asn1/asn1.c @@ -56,9 +56,7 @@ * definite and indefinite encodings. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index 3dbe691401..b01747eb05 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -59,9 +59,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> diff --git a/plugins/docsis/packet-bintrngreq.c b/plugins/docsis/packet-bintrngreq.c index 844dcb0f89..5b2256a85b 100644 --- a/plugins/docsis/packet-bintrngreq.c +++ b/plugins/docsis/packet-bintrngreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c index fcf49961b1..63f0c20aaa 100644 --- a/plugins/docsis/packet-bpkmattr.c +++ b/plugins/docsis/packet-bpkmattr.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c index 1cd537b891..b073cf6fe1 100644 --- a/plugins/docsis/packet-bpkmreq.c +++ b/plugins/docsis/packet-bpkmreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c index 5dfd2ea8fe..941abd8c0d 100644 --- a/plugins/docsis/packet-bpkmrsp.c +++ b/plugins/docsis/packet-bpkmrsp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-cmctrlreq.c b/plugins/docsis/packet-cmctrlreq.c index 4f2fd69799..dcadf54560 100644 --- a/plugins/docsis/packet-cmctrlreq.c +++ b/plugins/docsis/packet-cmctrlreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-cmctrlrsp.c b/plugins/docsis/packet-cmctrlrsp.c index 93125eb3d3..c0195bfce1 100644 --- a/plugins/docsis/packet-cmctrlrsp.c +++ b/plugins/docsis/packet-cmctrlrsp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-cmstatus.c b/plugins/docsis/packet-cmstatus.c index e2c95ef62d..fc50c0596d 100644 --- a/plugins/docsis/packet-cmstatus.c +++ b/plugins/docsis/packet-cmstatus.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-dbcack.c b/plugins/docsis/packet-dbcack.c index 5a6bba09a5..e2b43788e2 100644 --- a/plugins/docsis/packet-dbcack.c +++ b/plugins/docsis/packet-dbcack.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-dbcreq.c b/plugins/docsis/packet-dbcreq.c index 31332d3ad7..3b073854b9 100644 --- a/plugins/docsis/packet-dbcreq.c +++ b/plugins/docsis/packet-dbcreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-dbcrsp.c b/plugins/docsis/packet-dbcrsp.c index 1ab636b21e..34d0a18402 100644 --- a/plugins/docsis/packet-dbcrsp.c +++ b/plugins/docsis/packet-dbcrsp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c index d5af6345a0..c080196847 100644 --- a/plugins/docsis/packet-dccack.c +++ b/plugins/docsis/packet-dccack.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c index 534cfe48e3..a02bdbffaf 100644 --- a/plugins/docsis/packet-dccreq.c +++ b/plugins/docsis/packet-dccreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c index 793fa7ce6d..37cf71e749 100644 --- a/plugins/docsis/packet-dccrsp.c +++ b/plugins/docsis/packet-dccrsp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c index 8ba6a6bd4a..ccefe6333d 100644 --- a/plugins/docsis/packet-dcd.c +++ b/plugins/docsis/packet-dcd.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index c2fd907752..918d7cf62f 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -45,9 +45,7 @@ * as DOCSIS frames. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-dpvreq.c b/plugins/docsis/packet-dpvreq.c index 9b122716d4..d3a9035b50 100644 --- a/plugins/docsis/packet-dpvreq.c +++ b/plugins/docsis/packet-dpvreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-dpvrsp.c b/plugins/docsis/packet-dpvrsp.c index 7baeba4b64..c8bf0d2a5e 100644 --- a/plugins/docsis/packet-dpvrsp.c +++ b/plugins/docsis/packet-dpvrsp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c index 72d0ba8f62..62d21477ae 100644 --- a/plugins/docsis/packet-dsaack.c +++ b/plugins/docsis/packet-dsaack.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c index 725fba475a..1e3b9be75e 100644 --- a/plugins/docsis/packet-dsareq.c +++ b/plugins/docsis/packet-dsareq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c index 9694f145d3..33457b79d4 100644 --- a/plugins/docsis/packet-dsarsp.c +++ b/plugins/docsis/packet-dsarsp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c index beee43d76d..1b4a3c353b 100644 --- a/plugins/docsis/packet-dscack.c +++ b/plugins/docsis/packet-dscack.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c index 26fe3430ca..ac7aac268c 100644 --- a/plugins/docsis/packet-dscreq.c +++ b/plugins/docsis/packet-dscreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c index 9539e806e3..e342d8f7a6 100644 --- a/plugins/docsis/packet-dscrsp.c +++ b/plugins/docsis/packet-dscrsp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c index 28f5973996..40c0be2765 100644 --- a/plugins/docsis/packet-dsdreq.c +++ b/plugins/docsis/packet-dsdreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c index 1cc7b2c63c..4e71ec627e 100644 --- a/plugins/docsis/packet-dsdrsp.c +++ b/plugins/docsis/packet-dsdrsp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-intrngreq.c b/plugins/docsis/packet-intrngreq.c index b7f06c2632..2c7f1f204e 100644 --- a/plugins/docsis/packet-intrngreq.c +++ b/plugins/docsis/packet-intrngreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index 3eebd61bfd..2deda3250b 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c index fc259deea9..b4f275a2a7 100644 --- a/plugins/docsis/packet-map.c +++ b/plugins/docsis/packet-map.c @@ -21,9 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c index d41f19241e..54b14f1251 100644 --- a/plugins/docsis/packet-mdd.c +++ b/plugins/docsis/packet-mdd.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c index 54fca5d5ae..34ce866bf9 100644 --- a/plugins/docsis/packet-regack.c +++ b/plugins/docsis/packet-regack.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c index 2618c946f1..dd26d5c7ff 100644 --- a/plugins/docsis/packet-regreq.c +++ b/plugins/docsis/packet-regreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c index 85c648646b..fc16921517 100644 --- a/plugins/docsis/packet-regreqmp.c +++ b/plugins/docsis/packet-regreqmp.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c index 8969d9e835..84d9d69116 100644 --- a/plugins/docsis/packet-regrsp.c +++ b/plugins/docsis/packet-regrsp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c index 72c0864f8f..f57013affb 100644 --- a/plugins/docsis/packet-regrspmp.c +++ b/plugins/docsis/packet-regrspmp.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c index 156d2ee9fe..5deba47e12 100644 --- a/plugins/docsis/packet-rngreq.c +++ b/plugins/docsis/packet-rngreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c index 92216c8f8c..6a2cf0543e 100644 --- a/plugins/docsis/packet-rngrsp.c +++ b/plugins/docsis/packet-rngrsp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-sync.c b/plugins/docsis/packet-sync.c index b828261784..3e9053e00c 100644 --- a/plugins/docsis/packet-sync.c +++ b/plugins/docsis/packet-sync.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-tlv-cmctrl.c b/plugins/docsis/packet-tlv-cmctrl.c index 7872c14bf9..bb55b261b1 100644 --- a/plugins/docsis/packet-tlv-cmctrl.c +++ b/plugins/docsis/packet-tlv-cmctrl.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c index c117685030..cbaf21704e 100644 --- a/plugins/docsis/packet-tlv.c +++ b/plugins/docsis/packet-tlv.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include "packet-tlv.h" diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c index 7f36b7d1b0..40d415123d 100644 --- a/plugins/docsis/packet-type29ucd.c +++ b/plugins/docsis/packet-type29ucd.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c index 78d64da836..817bc54c7b 100644 --- a/plugins/docsis/packet-uccreq.c +++ b/plugins/docsis/packet-uccreq.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c index 59218e2e22..ac33e40402 100644 --- a/plugins/docsis/packet-uccrsp.c +++ b/plugins/docsis/packet-uccrsp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c index 91ced3d1fe..7d83f4a408 100644 --- a/plugins/docsis/packet-ucd.c +++ b/plugins/docsis/packet-ucd.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/plugins/docsis/packet-vendor.c b/plugins/docsis/packet-vendor.c index bf979194df..eaeb9038ba 100644 --- a/plugins/docsis/packet-vendor.c +++ b/plugins/docsis/packet-vendor.c @@ -41,9 +41,7 @@ * 5. Please see dissect_cisco for an example of how to do this. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> diff --git a/plugins/easy_codec/codec-g722.c b/plugins/easy_codec/codec-g722.c index 1214428c72..a96a747611 100644 --- a/plugins/easy_codec/codec-g722.c +++ b/plugins/easy_codec/codec-g722.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <memory.h> diff --git a/plugins/easy_codec/codec-g7231.c b/plugins/easy_codec/codec-g7231.c index b604c3350a..8408ad0c53 100644 --- a/plugins/easy_codec/codec-g7231.c +++ b/plugins/easy_codec/codec-g7231.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <memory.h> diff --git a/plugins/easy_codec/codec-g729a.c b/plugins/easy_codec/codec-g729a.c index 541dbd724b..399d02f787 100644 --- a/plugins/easy_codec/codec-g729a.c +++ b/plugins/easy_codec/codec-g729a.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <memory.h> diff --git a/plugins/easy_codec/easy_codec_plugin.c b/plugins/easy_codec/easy_codec_plugin.c index 84eddba802..75100e238a 100644 --- a/plugins/easy_codec/easy_codec_plugin.c +++ b/plugins/easy_codec/easy_codec_plugin.c @@ -24,9 +24,7 @@ */ #ifndef ENABLE_STATIC -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <gmodule.h> #include <epan/codecs.h> diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c index 91ccae452e..3e096f11d5 100644 --- a/plugins/ethercat/packet-ams.c +++ b/plugins/ethercat/packet-ams.c @@ -26,9 +26,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c index 25f90e360f..7620734ab4 100644 --- a/plugins/ethercat/packet-ecatmb.c +++ b/plugins/ethercat/packet-ecatmb.c @@ -26,9 +26,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c index 3e55ad93c3..b3e1f9fc0b 100644 --- a/plugins/ethercat/packet-esl.c +++ b/plugins/ethercat/packet-esl.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index f853f2156a..827af0f500 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -26,9 +26,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c index 83474d3e41..2956a5fd14 100644 --- a/plugins/ethercat/packet-ethercat-frame.c +++ b/plugins/ethercat/packet-ethercat-frame.c @@ -26,9 +26,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c index 574ff617fa..5793c065d8 100644 --- a/plugins/ethercat/packet-ioraw.c +++ b/plugins/ethercat/packet-ioraw.c @@ -26,9 +26,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c index 8b5832898b..58bc9f1633 100644 --- a/plugins/ethercat/packet-nv.c +++ b/plugins/ethercat/packet-nv.c @@ -26,9 +26,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c index c2ff7af034..c6d27f6223 100644 --- a/plugins/gryphon/packet-gryphon.c +++ b/plugins/gryphon/packet-gryphon.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c index e5264867b5..2939b79b97 100644 --- a/plugins/irda/packet-ircomm.c +++ b/plugins/irda/packet-ircomm.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index b83ac9f217..4c7e459ce3 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -27,9 +27,7 @@ * 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> diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index c23819ca0e..26819edd97 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -24,9 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/crc16-tvb.h> diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index d7eafa0f86..c723e3c84f 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/m2m/wimax_tlv.c b/plugins/m2m/wimax_tlv.c index 3e584f9502..687706e6ed 100644 --- a/plugins/m2m/wimax_tlv.c +++ b/plugins/m2m/wimax_tlv.c @@ -36,9 +36,7 @@ /* Makefile.nmake in .../plugins/m2m. */ /*************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <plugins/wimax/wimax_tlv.h> diff --git a/plugins/mate/mate.h b/plugins/mate/mate.h index 65405b3ea5..3c4db28236 100644 --- a/plugins/mate/mate.h +++ b/plugins/mate/mate.h @@ -28,9 +28,7 @@ #ifndef __MATE_H_ #define __MATE_H_ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifndef ENABLE_STATIC #include "moduleinfo.h" diff --git a/plugins/opcua/opcua.c b/plugins/opcua/opcua.c index d50dfeb4d4..de80d74abb 100644 --- a/plugins/opcua/opcua.c +++ b/plugins/opcua/opcua.c @@ -21,9 +21,7 @@ ** ******************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/prefs.h> diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/opcua/opcua_application_layer.c index 803a027ffa..fed712fce9 100644 --- a/plugins/opcua/opcua_application_layer.c +++ b/plugins/opcua/opcua_application_layer.c @@ -21,9 +21,7 @@ ** ******************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/opcua/opcua_complextypeparser.c b/plugins/opcua/opcua_complextypeparser.c index f3902f55bc..9fd6367c56 100644 --- a/plugins/opcua/opcua_complextypeparser.c +++ b/plugins/opcua/opcua_complextypeparser.c @@ -21,9 +21,7 @@ ** ******************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/opcua/opcua_enumparser.c b/plugins/opcua/opcua_enumparser.c index 6af58029e0..e11868f72b 100644 --- a/plugins/opcua/opcua_enumparser.c +++ b/plugins/opcua/opcua_enumparser.c @@ -21,9 +21,7 @@ ** ******************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/opcua/opcua_extensionobjecttable.c b/plugins/opcua/opcua_extensionobjecttable.c index 954f03bc04..8df9e0abaa 100644 --- a/plugins/opcua/opcua_extensionobjecttable.c +++ b/plugins/opcua/opcua_extensionobjecttable.c @@ -22,9 +22,7 @@ ** ******************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/opcua/opcua_hfindeces.c b/plugins/opcua/opcua_hfindeces.c index 16fcf0f406..9628f02442 100644 --- a/plugins/opcua/opcua_hfindeces.c +++ b/plugins/opcua/opcua_hfindeces.c @@ -21,9 +21,7 @@ ** ******************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/opcua/opcua_security_layer.c b/plugins/opcua/opcua_security_layer.c index 453ed740cc..e02af8327c 100644 --- a/plugins/opcua/opcua_security_layer.c +++ b/plugins/opcua/opcua_security_layer.c @@ -21,9 +21,7 @@ ** ******************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/opcua/opcua_serviceparser.c b/plugins/opcua/opcua_serviceparser.c index aa54b02ee1..25ce95b623 100644 --- a/plugins/opcua/opcua_serviceparser.c +++ b/plugins/opcua/opcua_serviceparser.c @@ -21,9 +21,7 @@ ** ******************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/opcua/opcua_servicetable.c b/plugins/opcua/opcua_servicetable.c index 784e78a3c1..1b62c99045 100644 --- a/plugins/opcua/opcua_servicetable.c +++ b/plugins/opcua/opcua_servicetable.c @@ -21,9 +21,7 @@ ** ******************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c index 01e4d006a5..3fee5ff66f 100644 --- a/plugins/opcua/opcua_simpletypes.c +++ b/plugins/opcua/opcua_simpletypes.c @@ -22,9 +22,7 @@ ** ******************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/opcua/opcua_transport_layer.c index e7873ddd1d..1009d8b5c5 100644 --- a/plugins/opcua/opcua_transport_layer.c +++ b/plugins/opcua/opcua_transport_layer.c @@ -21,9 +21,7 @@ ** ******************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index 44375d6aef..44402c4567 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -45,9 +45,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 476b80690b..b87b49afad 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/profinet/packet-dcom-cba.c index a50e416f33..ad95f6ebee 100644 --- a/plugins/profinet/packet-dcom-cba.c +++ b/plugins/profinet/packet-dcom-cba.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c index be32ec7a04..21cdfd1eb8 100644 --- a/plugins/profinet/packet-pn-dcp.c +++ b/plugins/profinet/packet-pn-dcp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c index 12a36309b7..7afc858b89 100644 --- a/plugins/profinet/packet-pn-mrp.c +++ b/plugins/profinet/packet-pn-mrp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c index b60ac4dd13..33f15edc2f 100644 --- a/plugins/profinet/packet-pn-mrrt.c +++ b/plugins/profinet/packet-pn-mrrt.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c index ec8129088e..706c99187e 100644 --- a/plugins/profinet/packet-pn-ptcp.c +++ b/plugins/profinet/packet-pn-ptcp.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c index 493652f585..b8df1054c9 100644 --- a/plugins/profinet/packet-pn-rt.c +++ b/plugins/profinet/packet-pn-rt.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> diff --git a/plugins/profinet/packet-pn.c b/plugins/profinet/packet-pn.c index a6dc5a5248..cd5f590f71 100644 --- a/plugins/profinet/packet-pn.c +++ b/plugins/profinet/packet-pn.c @@ -23,9 +23,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/stats_tree/pinfo_stats_tree.c index 02467d24d3..e4ada8e9ac 100644 --- a/plugins/stats_tree/pinfo_stats_tree.c +++ b/plugins/stats_tree/pinfo_stats_tree.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/stats_tree.h> #include <epan/prefs.h> diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/stats_tree/stats_tree_plugin.c index 9bda985a27..3f0614b89f 100644 --- a/plugins/stats_tree/stats_tree_plugin.c +++ b/plugins/stats_tree/stats_tree_plugin.c @@ -24,9 +24,7 @@ */ #ifndef ENABLE_STATIC -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <gmodule.h> diff --git a/plugins/tpg/packet-http.c b/plugins/tpg/packet-http.c index f84bafe6a1..13d01930b7 100644 --- a/plugins/tpg/packet-http.c +++ b/plugins/tpg/packet-http.c @@ -21,9 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "http-parser.h" #include <gmodule.h> diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index 7443c97b26..59895b37f9 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -24,9 +24,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index aede762815..1cc60fdfcb 100644 --- a/plugins/wimax/mac_hd_generic_decoder.c +++ b/plugins/wimax/mac_hd_generic_decoder.c @@ -33,9 +33,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* #define DEBUG diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/wimax/mac_hd_type1_decoder.c index c8618ccb2b..c4fcb4b007 100644 --- a/plugins/wimax/mac_hd_type1_decoder.c +++ b/plugins/wimax/mac_hd_type1_decoder.c @@ -33,9 +33,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* #define DEBUG diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/wimax/mac_hd_type2_decoder.c index e165dd3a6d..63307fcc9a 100644 --- a/plugins/wimax/mac_hd_type2_decoder.c +++ b/plugins/wimax/mac_hd_type2_decoder.c @@ -37,9 +37,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c index 9c261bd4b0..75d7f63f5f 100644 --- a/plugins/wimax/mac_mgmt_msg_decoder.c +++ b/plugins/wimax/mac_mgmt_msg_decoder.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/wimax/msg_aas_beam.c index a5f50e2996..1151d79992 100644 --- a/plugins/wimax/msg_aas_beam.c +++ b/plugins/wimax/msg_aas_beam.c @@ -30,9 +30,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_aas_fbck.c b/plugins/wimax/msg_aas_fbck.c index c650ac182b..29c74dc425 100644 --- a/plugins/wimax/msg_aas_fbck.c +++ b/plugins/wimax/msg_aas_fbck.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_arq.c b/plugins/wimax/msg_arq.c index b516c6dd65..aa6e839872 100644 --- a/plugins/wimax/msg_arq.c +++ b/plugins/wimax/msg_arq.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "moduleinfo.h" diff --git a/plugins/wimax/msg_clk_cmp.c b/plugins/wimax/msg_clk_cmp.c index 03cfb607bc..77cf7a07d0 100644 --- a/plugins/wimax/msg_clk_cmp.c +++ b/plugins/wimax/msg_clk_cmp.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_dcd.c b/plugins/wimax/msg_dcd.c index ee1ba55461..75e183b583 100644 --- a/plugins/wimax/msg_dcd.c +++ b/plugins/wimax/msg_dcd.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* #define DEBUG diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c index 00c047aaf0..91ca190284 100644 --- a/plugins/wimax/msg_dlmap.c +++ b/plugins/wimax/msg_dlmap.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_dreg.c b/plugins/wimax/msg_dreg.c index 47380d5a92..66a2348af5 100644 --- a/plugins/wimax/msg_dreg.c +++ b/plugins/wimax/msg_dreg.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "moduleinfo.h" diff --git a/plugins/wimax/msg_dsa.c b/plugins/wimax/msg_dsa.c index a5ece8e8d3..b02013884a 100644 --- a/plugins/wimax/msg_dsa.c +++ b/plugins/wimax/msg_dsa.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* #define DEBUG diff --git a/plugins/wimax/msg_dsc.c b/plugins/wimax/msg_dsc.c index 39c7959ddc..9224dbb89a 100644 --- a/plugins/wimax/msg_dsc.c +++ b/plugins/wimax/msg_dsc.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* #define DEBUG diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c index 2f2e9668d4..d19b43af2e 100644 --- a/plugins/wimax/msg_dsd.c +++ b/plugins/wimax/msg_dsd.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* #define DEBUG diff --git a/plugins/wimax/msg_dsx_rvd.c b/plugins/wimax/msg_dsx_rvd.c index 7bded74d69..c0723169e6 100644 --- a/plugins/wimax/msg_dsx_rvd.c +++ b/plugins/wimax/msg_dsx_rvd.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_fpc.c b/plugins/wimax/msg_fpc.c index d1d6c727b4..5ca89668d3 100644 --- a/plugins/wimax/msg_fpc.c +++ b/plugins/wimax/msg_fpc.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_pkm.c b/plugins/wimax/msg_pkm.c index 49b1af99ee..ce93071790 100644 --- a/plugins/wimax/msg_pkm.c +++ b/plugins/wimax/msg_pkm.c @@ -32,9 +32,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_pmc.c b/plugins/wimax/msg_pmc.c index 9e770b25f2..2ac8dae291 100644 --- a/plugins/wimax/msg_pmc.c +++ b/plugins/wimax/msg_pmc.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "moduleinfo.h" diff --git a/plugins/wimax/msg_prc_lt_ctrl.c b/plugins/wimax/msg_prc_lt_ctrl.c index 7b9c79f7eb..147ceba5b4 100644 --- a/plugins/wimax/msg_prc_lt_ctrl.c +++ b/plugins/wimax/msg_prc_lt_ctrl.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_reg_req.c b/plugins/wimax/msg_reg_req.c index 2448d66ab5..5fd5a81f7b 100644 --- a/plugins/wimax/msg_reg_req.c +++ b/plugins/wimax/msg_reg_req.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define WIMAX_16E_2005 diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/wimax/msg_reg_rsp.c index a429d3a4ae..fb79c765a9 100644 --- a/plugins/wimax/msg_reg_rsp.c +++ b/plugins/wimax/msg_reg_rsp.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define WIMAX_16E_2005 diff --git a/plugins/wimax/msg_rep.c b/plugins/wimax/msg_rep.c index 02306bd073..b7b96bb429 100644 --- a/plugins/wimax/msg_rep.c +++ b/plugins/wimax/msg_rep.c @@ -31,9 +31,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_res_cmd.c b/plugins/wimax/msg_res_cmd.c index e9ebe9654d..2632bc9bc0 100644 --- a/plugins/wimax/msg_res_cmd.c +++ b/plugins/wimax/msg_res_cmd.c @@ -32,9 +32,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_rng_req.c b/plugins/wimax/msg_rng_req.c index 20923073ee..47563a5c36 100644 --- a/plugins/wimax/msg_rng_req.c +++ b/plugins/wimax/msg_rng_req.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c index bf7e4e5bc2..94a903b008 100644 --- a/plugins/wimax/msg_rng_rsp.c +++ b/plugins/wimax/msg_rng_rsp.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c index 69f3965809..02f7b1eb79 100644 --- a/plugins/wimax/msg_sbc.c +++ b/plugins/wimax/msg_sbc.c @@ -32,9 +32,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c index b30b13f560..2a1c840220 100644 --- a/plugins/wimax/msg_ucd.c +++ b/plugins/wimax/msg_ucd.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* #define DEBUG diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c index 02ef8b7c55..cc8091f6b3 100644 --- a/plugins/wimax/msg_ulmap.c +++ b/plugins/wimax/msg_ulmap.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c index 10c34637c6..fc69be3e21 100644 --- a/plugins/wimax/packet-wmx.c +++ b/plugins/wimax/packet-wmx.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> #include <glib.h> diff --git a/plugins/wimax/wimax_cdma_code_decoder.c b/plugins/wimax/wimax_cdma_code_decoder.c index 95613d199d..fdd793992d 100644 --- a/plugins/wimax/wimax_cdma_code_decoder.c +++ b/plugins/wimax/wimax_cdma_code_decoder.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c index 8f0159aa6a..dce4e2839e 100644 --- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c index 93b0cb38e5..19db382bf6 100644 --- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/wimax/wimax_fch_decoder.c index 6f1ab082ca..1ced14319c 100644 --- a/plugins/wimax/wimax_fch_decoder.c +++ b/plugins/wimax/wimax_fch_decoder.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> #include <glib.h> diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/wimax/wimax_ffb_decoder.c index 2fe3e0af64..c46a075af8 100644 --- a/plugins/wimax/wimax_ffb_decoder.c +++ b/plugins/wimax/wimax_ffb_decoder.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/wimax/wimax_hack_decoder.c index a29c7eae3a..09403206a5 100644 --- a/plugins/wimax/wimax_hack_decoder.c +++ b/plugins/wimax/wimax_hack_decoder.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/wimax/wimax_harq_map_decoder.c index c6b1779df3..3904e1d2d4 100644 --- a/plugins/wimax/wimax_harq_map_decoder.c +++ b/plugins/wimax/wimax_harq_map_decoder.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/wimax_pdu_decoder.c b/plugins/wimax/wimax_pdu_decoder.c index fae29d222d..2d5cfa6d28 100644 --- a/plugins/wimax/wimax_pdu_decoder.c +++ b/plugins/wimax/wimax_pdu_decoder.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/wimax/wimax_phy_attributes_decoder.c index a4a6f63e06..71a7104c85 100644 --- a/plugins/wimax/wimax_phy_attributes_decoder.c +++ b/plugins/wimax/wimax_phy_attributes_decoder.c @@ -28,9 +28,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimax/wimax_tlv.c b/plugins/wimax/wimax_tlv.c index 63a075d0e0..7b5e25890a 100644 --- a/plugins/wimax/wimax_tlv.c +++ b/plugins/wimax/wimax_tlv.c @@ -36,9 +36,7 @@ /* Makefile.nmake in .../plugins/m2m. */ /*************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wimax_tlv.h" diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c index 8a88f6a1ef..d2231577c6 100644 --- a/plugins/wimax/wimax_utils.c +++ b/plugins/wimax/wimax_utils.c @@ -30,9 +30,7 @@ #define DEBUG */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index e4d66f7009..204db9e164 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -28,9 +28,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/plugins/wimaxasncp/wimaxasncp_dict.l b/plugins/wimaxasncp/wimaxasncp_dict.l index e176822325..addd27b2b0 100644 --- a/plugins/wimaxasncp/wimaxasncp_dict.l +++ b/plugins/wimaxasncp/wimaxasncp_dict.l @@ -52,9 +52,7 @@ ** Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <stdio.h> diff --git a/plugins/wimaxmacphy/packet-wimaxmacphy.c b/plugins/wimaxmacphy/packet-wimaxmacphy.c index 4270c3769a..dc10de2228 100644 --- a/plugins/wimaxmacphy/packet-wimaxmacphy.c +++ b/plugins/wimaxmacphy/packet-wimaxmacphy.c @@ -24,9 +24,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/proto_hier_stats.c b/proto_hier_stats.c index e01b3893aa..50c8bd54e0 100644 --- a/proto_hier_stats.c +++ b/proto_hier_stats.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/rawshark.c b/rawshark.c index b55c27982b..7df9475fb2 100644 --- a/rawshark.c +++ b/rawshark.c @@ -34,9 +34,7 @@ * - Prints a status line, followed by fields from a specified list. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> #include <stdio.h> @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ringbuffer.c b/ringbuffer.c index ce81600866..8c4a47bffd 100644 --- a/ringbuffer.c +++ b/ringbuffer.c @@ -42,9 +42,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_LIBPCAP @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <wiretap/pcap-encap.h> diff --git a/sync_pipe_write.c b/sync_pipe_write.c index 8ca5eed9f3..c301da7e5c 100644 --- a/sync_pipe_write.c +++ b/sync_pipe_write.c @@ -21,9 +21,7 @@ * 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> diff --git a/tap-megaco-common.c b/tap-megaco-common.c index 6bbfc937e3..f2688bbc5e 100644 --- a/tap-megaco-common.c +++ b/tap-megaco-common.c @@ -25,9 +25,7 @@ * 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> diff --git a/tap-rtp-common.c b/tap-rtp-common.c index 05e6d49dc6..2706e8a332 100644 --- a/tap-rtp-common.c +++ b/tap-rtp-common.c @@ -29,9 +29,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <math.h> diff --git a/tempfile.c b/tempfile.c index f733fd1721..9c3fd6f241 100644 --- a/tempfile.c +++ b/tempfile.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/text2pcap.c b/text2pcap.c index ec6a22ed4a..3fef814312 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -77,9 +77,7 @@ * snaplength is automatically set to 64K. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" /* * Just make sure we include the prototype for strptime as well diff --git a/timestats.c b/timestats.c index 6d7dbe08b5..9803999b91 100644 --- a/timestats.c +++ b/timestats.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "timestats.h" @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> #include <stdio.h> @@ -27,9 +27,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> #include <string.h> diff --git a/ui/cli/tap-afpstat.c b/ui/cli/tap-afpstat.c index 5a7571d80f..9721731c92 100644 --- a/ui/cli/tap-afpstat.c +++ b/ui/cli/tap-afpstat.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-ansi_astat.c b/ui/cli/tap-ansi_astat.c index 0f4f2839ec..bf34feced5 100644 --- a/ui/cli/tap-ansi_astat.c +++ b/ui/cli/tap-ansi_astat.c @@ -28,9 +28,7 @@ * This TAP provides statistics for the ANSI A Interface: */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-bootpstat.c b/ui/cli/tap-bootpstat.c index 57783f9da7..00ffbbfff1 100644 --- a/ui/cli/tap-bootpstat.c +++ b/ui/cli/tap-bootpstat.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/cli/tap-camelcounter.c b/ui/cli/tap-camelcounter.c index d5fde1b4c9..600a351e0a 100644 --- a/ui/cli/tap-camelcounter.c +++ b/ui/cli/tap-camelcounter.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c index 7490940910..2c0e19dda8 100644 --- a/ui/cli/tap-camelsrt.c +++ b/ui/cli/tap-camelsrt.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index 7754677749..970854cdae 100644 --- a/ui/cli/tap-comparestat.c +++ b/ui/cli/tap-comparestat.c @@ -32,9 +32,7 @@ * It is only used by tshark and not wireshark */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <math.h> diff --git a/ui/cli/tap-dcerpcstat.c b/ui/cli/tap-dcerpcstat.c index a8b7897c33..677095c5e7 100644 --- a/ui/cli/tap-dcerpcstat.c +++ b/ui/cli/tap-dcerpcstat.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index 709b652a78..fa0b4c476a 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/ui/cli/tap-diameter-avp.c @@ -36,9 +36,7 @@ * E.g. Zero or more Multiple-Services-Credit-Control AVPs(456) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c index b5978a2910..ac68219abd 100644 --- a/ui/cli/tap-expert.c +++ b/ui/cli/tap-expert.c @@ -23,9 +23,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c index 495f975fc8..db74e6aba8 100644 --- a/ui/cli/tap-follow.c +++ b/ui/cli/tap-follow.c @@ -27,9 +27,7 @@ * It is only used by tshark and not wireshark. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c index 0326ca874d..455a4eda6b 100644 --- a/ui/cli/tap-funnel.c +++ b/ui/cli/tap-funnel.c @@ -26,9 +26,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <wiretap/wtap.h> diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c index 7006c5b2a8..fe98cf0ada 100644 --- a/ui/cli/tap-gsm_astat.c +++ b/ui/cli/tap-gsm_astat.c @@ -28,9 +28,7 @@ * This TAP provides statistics for the GSM A Interface: */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-h225counter.c b/ui/cli/tap-h225counter.c index f324112f81..6707a7689a 100644 --- a/ui/cli/tap-h225counter.c +++ b/ui/cli/tap-h225counter.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-h225rassrt.c b/ui/cli/tap-h225rassrt.c index abacf98159..456d54c1b2 100644 --- a/ui/cli/tap-h225rassrt.c +++ b/ui/cli/tap-h225rassrt.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-hosts.c b/ui/cli/tap-hosts.c index 936b53065e..5e397feb15 100644 --- a/ui/cli/tap-hosts.c +++ b/ui/cli/tap-hosts.c @@ -23,9 +23,7 @@ /* Dump our collected IPv4- and IPv6-to-hostname mappings */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c index ffedf5cfe3..d10291292a 100644 --- a/ui/cli/tap-httpstat.c +++ b/ui/cli/tap-httpstat.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c index ce53b2e026..66cb89e7ee 100644 --- a/ui/cli/tap-icmpstat.c +++ b/ui/cli/tap-icmpstat.c @@ -28,9 +28,7 @@ * It was based on tap-rpcstat.c and doc/README.tapping. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c index 37ba0fedae..610d98d993 100644 --- a/ui/cli/tap-icmpv6stat.c +++ b/ui/cli/tap-icmpv6stat.c @@ -29,9 +29,7 @@ * doc/README.tapping. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c index 35e0a49465..b0bc46391f 100644 --- a/ui/cli/tap-iostat.c +++ b/ui/cli/tap-iostat.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c index 14e616532e..201f5c6bf0 100644 --- a/ui/cli/tap-iousers.c +++ b/ui/cli/tap-iousers.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c index cf2df41e09..1c80e87150 100644 --- a/ui/cli/tap-macltestat.c +++ b/ui/cli/tap-macltestat.c @@ -23,9 +23,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> diff --git a/ui/cli/tap-megacostat.c b/ui/cli/tap-megacostat.c index 921640f160..11543fdb33 100644 --- a/ui/cli/tap-megacostat.c +++ b/ui/cli/tap-megacostat.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-mgcpstat.c b/ui/cli/tap-mgcpstat.c index 1fd82db05f..d7d9beb4a4 100644 --- a/ui/cli/tap-mgcpstat.c +++ b/ui/cli/tap-mgcpstat.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c index 1495890b3d..121a205eb8 100644 --- a/ui/cli/tap-protocolinfo.c +++ b/ui/cli/tap-protocolinfo.c @@ -24,9 +24,7 @@ /* This module provides Protocol Column Info tap for tshark */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c index 6a4649a813..3ffd8b9cd0 100644 --- a/ui/cli/tap-protohierstat.c +++ b/ui/cli/tap-protohierstat.c @@ -24,9 +24,7 @@ /* This module provides ProtocolHierarchyStatistics for tshark */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-radiusstat.c b/ui/cli/tap-radiusstat.c index 9467bc8c8d..26271e2806 100644 --- a/ui/cli/tap-radiusstat.c +++ b/ui/cli/tap-radiusstat.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c index ab334dd18b..5b0c3e51ed 100644 --- a/ui/cli/tap-rlcltestat.c +++ b/ui/cli/tap-rlcltestat.c @@ -23,9 +23,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c index a325288a49..c80dce0127 100644 --- a/ui/cli/tap-rpcprogs.c +++ b/ui/cli/tap-rpcprogs.c @@ -26,9 +26,7 @@ * It is only used by tshark and not wireshark */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-rpcstat.c b/ui/cli/tap-rpcstat.c index 79830715de..32a18c6bb5 100644 --- a/ui/cli/tap-rpcstat.c +++ b/ui/cli/tap-rpcstat.c @@ -28,9 +28,7 @@ * It serves as an example on how to use the tap api. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c index 20da2283bc..f81966bbe0 100644 --- a/ui/cli/tap-rtp.c +++ b/ui/cli/tap-rtp.c @@ -33,9 +33,7 @@ * This TAP provides statistics for RTP streams */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c index 325b38c4d5..e0de4b8ec6 100644 --- a/ui/cli/tap-rtspstat.c +++ b/ui/cli/tap-rtspstat.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/cli/tap-scsistat.c b/ui/cli/tap-scsistat.c index b0dae2960d..b8b226f097 100644 --- a/ui/cli/tap-scsistat.c +++ b/ui/cli/tap-scsistat.c @@ -21,9 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c index 9e03be272d..1d1ff52a18 100644 --- a/ui/cli/tap-sctpchunkstat.c +++ b/ui/cli/tap-sctpchunkstat.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c index dc34281702..cd794aa030 100644 --- a/ui/cli/tap-sipstat.c +++ b/ui/cli/tap-sipstat.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c index 6fb66623a5..e5c65e9039 100644 --- a/ui/cli/tap-smbsids.c +++ b/ui/cli/tap-smbsids.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-smbstat.c b/ui/cli/tap-smbstat.c index c56f64946a..def34b89ea 100644 --- a/ui/cli/tap-smbstat.c +++ b/ui/cli/tap-smbstat.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/cli/tap-stats_tree.c b/ui/cli/tap-stats_tree.c index 4ba1fe38e7..ec6a165763 100644 --- a/ui/cli/tap-stats_tree.c +++ b/ui/cli/tap-stats_tree.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> #include <stdio.h> diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c index 6406db6df2..6b54e8820b 100644 --- a/ui/cli/tap-sv.c +++ b/ui/cli/tap-sv.c @@ -23,9 +23,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <stdlib.h> diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c index e10f9babce..82895ec063 100644 --- a/ui/cli/tap-wspstat.c +++ b/ui/cli/tap-wspstat.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <string.h> diff --git a/version_info.c b/version_info.c index 8d3c276ea6..24639e7c99 100644 --- a/version_info.c +++ b/version_info.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/wiretap/5views.c b/wiretap/5views.c index 834deb519a..f746c45548 100644 --- a/wiretap/5views.c +++ b/wiretap/5views.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> #include <time.h> diff --git a/wiretap/aethra.c b/wiretap/aethra.c index e4ab651f3c..0f83be815e 100644 --- a/wiretap/aethra.c +++ b/wiretap/aethra.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> #include "wtap-int.h" diff --git a/wiretap/ascendtext.c b/wiretap/ascendtext.c index 385d28b085..0907bca42d 100644 --- a/wiretap/ascendtext.c +++ b/wiretap/ascendtext.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "buffer.h" #include "ascendtext.h" diff --git a/wiretap/atm.c b/wiretap/atm.c index fa6ae88d93..97d406bdfa 100644 --- a/wiretap/atm.c +++ b/wiretap/atm.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "atm.h" diff --git a/wiretap/ber.c b/wiretap/ber.c index f08293faa7..22a1336877 100644 --- a/wiretap/ber.c +++ b/wiretap/ber.c @@ -19,9 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c index 9bf453fe9e..c23bf2cc1e 100644 --- a/wiretap/btsnoop.c +++ b/wiretap/btsnoop.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> #include "wtap-int.h" diff --git a/wiretap/buffer.c b/wiretap/buffer.c index 865a74ab87..e6df387af1 100644 --- a/wiretap/buffer.c +++ b/wiretap/buffer.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c index a01c5d0584..9fbf23bead 100644 --- a/wiretap/catapult_dct2000.c +++ b/wiretap/catapult_dct2000.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> #include <stdlib.h> diff --git a/wiretap/commview.c b/wiretap/commview.c index 61364eaa69..fb97f3d2eb 100644 --- a/wiretap/commview.c +++ b/wiretap/commview.c @@ -30,9 +30,7 @@ * http://www.tamos.com/htmlhelp/commview/logformat.htm */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <stdio.h> diff --git a/wiretap/cosine.c b/wiretap/cosine.c index 3e590291a1..ebd11709b2 100644 --- a/wiretap/cosine.c +++ b/wiretap/cosine.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "buffer.h" #include "cosine.h" diff --git a/wiretap/csids.c b/wiretap/csids.c index 8f330cf9e8..b8d24a83b1 100644 --- a/wiretap/csids.c +++ b/wiretap/csids.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "buffer.h" #include "csids.h" diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c index e0b6b0fd8b..c6c51b351f 100644 --- a/wiretap/daintree-sna.c +++ b/wiretap/daintree-sna.c @@ -46,9 +46,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <stdio.h> diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c index 54719767e1..867bb40221 100644 --- a/wiretap/dbs-etherwatch.c +++ b/wiretap/dbs-etherwatch.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "buffer.h" #include "dbs-etherwatch.h" diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c index 5eec026bc4..ac58b5785f 100644 --- a/wiretap/dct3trace.c +++ b/wiretap/dct3trace.c @@ -26,9 +26,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "buffer.h" #include "dct3trace.h" diff --git a/wiretap/erf.c b/wiretap/erf.c index 9e431f3020..fdb0f23fbf 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -42,9 +42,7 @@ * http://www.endace.com/support/EndaceRecordFormat.pdf */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <string.h> diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c index 6c4f976c45..6c5c78a82e 100644 --- a/wiretap/eyesdn.c +++ b/wiretap/eyesdn.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "buffer.h" #include "eyesdn.h" diff --git a/wiretap/file_access.c b/wiretap/file_access.c index ddbfe1a082..1850405bd1 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <string.h> diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c index f4d83d96b6..7e89bb6fbd 100644 --- a/wiretap/file_wrappers.c +++ b/wiretap/file_wrappers.c @@ -41,9 +41,7 @@ * 3. This notice may not be removed or altered from any source distribution. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/wiretap/hcidump.c b/wiretap/hcidump.c index 5454514906..cf7ca8df90 100644 --- a/wiretap/hcidump.c +++ b/wiretap/hcidump.c @@ -19,9 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "file_wrappers.h" diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c index b87cd8211f..647ce51d62 100644 --- a/wiretap/i4btrace.c +++ b/wiretap/i4btrace.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <errno.h> diff --git a/wiretap/ipfix.c b/wiretap/ipfix.c index 473b8eebab..2d7d0d3f68 100644 --- a/wiretap/ipfix.c +++ b/wiretap/ipfix.c @@ -60,9 +60,7 @@ * as far as the dissector is concerned. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <string.h> diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index 58834a0af9..ee343aa3e6 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <errno.h> #include <string.h> diff --git a/wiretap/iseries.c b/wiretap/iseries.c index 3aa697e46c..3dea66fd7f 100644 --- a/wiretap/iseries.c +++ b/wiretap/iseries.c @@ -131,9 +131,7 @@ Number S/R Length Timer MAC Address MAC Address A00216D06A200000 020405B40402080A 1104B6C000000000 010303000B443BF1 **..*J .....*......**.........D;** */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "buffer.h" #include "iseries.h" diff --git a/wiretap/k12.c b/wiretap/k12.c index a78eba0b87..c33a43b626 100644 --- a/wiretap/k12.c +++ b/wiretap/k12.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <string.h> #include <errno.h> diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index abde1abcf6..e699615d76 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <errno.h> #include "wtap-int.h" diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 08cf091ce2..bec6cf6435 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <string.h> diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c index 510d98ef77..16ba58a751 100644 --- a/wiretap/mime_file.c +++ b/wiretap/mime_file.c @@ -29,9 +29,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/wiretap/mp2t.c b/wiretap/mp2t.c index 749dc6ba2a..aa31ee2f1b 100644 --- a/wiretap/mp2t.c +++ b/wiretap/mp2t.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c index f42dc65b4c..8eec67974b 100644 --- a/wiretap/mpeg.c +++ b/wiretap/mpeg.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 9977d40f4d..436a6d95fd 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> #include "wtap-int.h" diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index 1902f8406a..d0765ae49b 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> #include "wtap-int.h" diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c index 24e033c3c2..8eb1843fe9 100644 --- a/wiretap/netscreen.c +++ b/wiretap/netscreen.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "buffer.h" #include "netscreen.h" diff --git a/wiretap/nettl.c b/wiretap/nettl.c index 23ebbbbe44..ec75055fd7 100644 --- a/wiretap/nettl.c +++ b/wiretap/nettl.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <errno.h> diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c index 2bdf1e6a60..fbd32639c5 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -19,9 +19,7 @@ * * ***************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <errno.h> diff --git a/wiretap/netxray.c b/wiretap/netxray.c index a3c04faac9..e05440dcca 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 3aedd00d77..246d6b5acc 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -54,9 +54,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c index ba80f55b63..03974b1bfb 100644 --- a/wiretap/packetlogger.c +++ b/wiretap/packetlogger.c @@ -27,9 +27,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <stdio.h> diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 1b52422f01..470a0d699a 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <string.h> diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index aaaebba808..c7a5ee6982 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -29,9 +29,7 @@ * http://wiki.wireshark.org/Development/PcapNg */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <string.h> diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c index 73f3ee03d8..5dfbd5ac2c 100644 --- a/wiretap/peekclassic.c +++ b/wiretap/peekclassic.c @@ -35,9 +35,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> #include "wtap-int.h" diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c index 5898427ecd..96558786b4 100644 --- a/wiretap/peektagged.c +++ b/wiretap/peektagged.c @@ -32,9 +32,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> #include <stdlib.h> diff --git a/wiretap/pppdump.c b/wiretap/pppdump.c index 28fb64f124..97e3edde47 100644 --- a/wiretap/pppdump.c +++ b/wiretap/pppdump.c @@ -19,9 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "buffer.h" #include "pppdump.h" diff --git a/wiretap/radcom.c b/wiretap/radcom.c index fb53f7355e..828ebf4438 100644 --- a/wiretap/radcom.c +++ b/wiretap/radcom.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> diff --git a/wiretap/snoop.c b/wiretap/snoop.c index 4a74c4533b..fd12e29004 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> #include "wtap-int.h" diff --git a/wiretap/tnef.c b/wiretap/tnef.c index 0328264985..c62ab49754 100644 --- a/wiretap/tnef.c +++ b/wiretap/tnef.c @@ -19,9 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c index 288d242565..784d430be4 100644 --- a/wiretap/toshiba.c +++ b/wiretap/toshiba.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "buffer.h" #include "toshiba.h" diff --git a/wiretap/visual.c b/wiretap/visual.c index 6fc6b27b95..078396a49f 100644 --- a/wiretap/visual.c +++ b/wiretap/visual.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> #include "wtap-int.h" diff --git a/wiretap/vms.c b/wiretap/vms.c index ac3d7fe638..293654b6f0 100644 --- a/wiretap/vms.c +++ b/wiretap/vms.c @@ -27,9 +27,7 @@ * TCPIPTRACE_FRAGMENTS_HAVE_HEADER_LINE to expect the first line to be * at the start of every packet. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wtap-int.h" #include "buffer.h" #include "vms.h" diff --git a/wiretap/vwr.c b/wiretap/vwr.c index 6244910b38..bd565b1fbf 100644 --- a/wiretap/vwr.c +++ b/wiretap/vwr.c @@ -21,9 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <errno.h> #include <string.h> diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 204c1e2b00..893847b86b 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> #include <errno.h> diff --git a/wsutil/airpdcap_wep.c b/wsutil/airpdcap_wep.c index 29d7d44743..2ff4ca12b6 100644 --- a/wsutil/airpdcap_wep.c +++ b/wsutil/airpdcap_wep.c @@ -33,9 +33,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" /************************************************************************/ /* File includes */ diff --git a/wsutil/crc10.c b/wsutil/crc10.c index 77d5068624..7a4b1c4c5f 100644 --- a/wsutil/crc10.c +++ b/wsutil/crc10.c @@ -21,9 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/wsutil/crc16.c b/wsutil/crc16.c index 54aa6fda6c..f7a7a92b66 100644 --- a/wsutil/crc16.c +++ b/wsutil/crc16.c @@ -31,9 +31,7 @@ * DCEs using asynchronous-to-synchronous conversion", Para. 8.1.1.6.1 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <wsutil/crc16.h> diff --git a/wsutil/crc32.c b/wsutil/crc32.c index e98ab269e2..dbbe288d2d 100644 --- a/wsutil/crc32.c +++ b/wsutil/crc32.c @@ -27,9 +27,7 @@ * Routine from Chris Waters */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <wsutil/crc32.h> diff --git a/wsutil/crc6.c b/wsutil/crc6.c index bdd97ae941..9b5e88eaed 100644 --- a/wsutil/crc6.c +++ b/wsutil/crc6.c @@ -23,9 +23,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include "crc6.h" diff --git a/wsutil/crc7.c b/wsutil/crc7.c index 4ed1410b3a..cf4d99d0ba 100644 --- a/wsutil/crc7.c +++ b/wsutil/crc7.c @@ -35,9 +35,7 @@ * ReflectOut = False * Algorithm = table-driven *****************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include "crc7.h" /* include the header file generated with pycrc */ diff --git a/wsutil/crc8.c b/wsutil/crc8.c index 6e344d1af0..420a635474 100644 --- a/wsutil/crc8.c +++ b/wsutil/crc8.c @@ -25,9 +25,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <wsutil/crc8.h> diff --git a/wsutil/file_util.c b/wsutil/file_util.c index a024496585..c9186c423d 100644 --- a/wsutil/file_util.c +++ b/wsutil/file_util.c @@ -34,9 +34,7 @@ #error "This is only for Windows" #endif -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/wsutil/inet_aton.c b/wsutil/inet_aton.c index 48bc84124c..6760d91246 100644 --- a/wsutil/inet_aton.c +++ b/wsutil/inet_aton.c @@ -27,9 +27,7 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93"; diff --git a/wsutil/inet_ntop.c b/wsutil/inet_ntop.c index 0e38365ad6..7258f4a481 100644 --- a/wsutil/inet_ntop.c +++ b/wsutil/inet_ntop.c @@ -18,9 +18,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> diff --git a/wsutil/inet_pton.c b/wsutil/inet_pton.c index bfa2535f3e..67e3ea973f 100644 --- a/wsutil/inet_pton.c +++ b/wsutil/inet_pton.c @@ -17,9 +17,7 @@ * SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> diff --git a/wsutil/privileges.c b/wsutil/privileges.c index 039949c07b..4cb3e6b497 100644 --- a/wsutil/privileges.c +++ b/wsutil/privileges.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #if defined(HAVE_SETRESUID) || defined(HAVE_SETREGUID) #define _GNU_SOURCE /* Otherwise [sg]etres[gu]id won't be defined on Linux */ diff --git a/wsutil/str_util.c b/wsutil/str_util.c index d4fb3f34fc..065ca83d25 100644 --- a/wsutil/str_util.c +++ b/wsutil/str_util.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include "str_util.h" diff --git a/wsutil/strptime.c b/wsutil/strptime.c index 626235f4d3..1680fa26a7 100644 --- a/wsutil/strptime.c +++ b/wsutil/strptime.c @@ -23,9 +23,7 @@ some of them in the same format (such as year, week and weekday) this is enough information for determining the date. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <ctype.h> #include <limits.h> diff --git a/wsutil/type_util.c b/wsutil/type_util.c index 87a401f835..00318b7860 100644 --- a/wsutil/type_util.c +++ b/wsutil/type_util.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include "type_util.h" diff --git a/wsutil/wsgetopt.c b/wsutil/wsgetopt.c index 8007268b91..44b71af209 100644 --- a/wsutil/wsgetopt.c +++ b/wsutil/wsgetopt.c @@ -30,9 +30,7 @@ # define _NO_PROTO #endif -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include "config.h" #include <stdio.h> |