diff options
Diffstat (limited to 'epan/dissectors')
1097 files changed, 823 insertions, 3018 deletions
diff --git a/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c b/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c index 6add6cb284..af667d929f 100644 --- a/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c +++ b/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.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 <glib.h> #include <string.h> diff --git a/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.c b/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.c index b178e5b52b..efeaf664ce 100644 --- a/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.c +++ b/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-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 <glib.h> #include <string.h> diff --git a/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.c b/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.c index ec269f40ca..af075a3d33 100644 --- a/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.c +++ b/epan/dissectors/dcerpc/drsuapi/packet-dcerpc-drsuapi-template.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 <glib.h> #include <string.h> diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c index c106a9cc6e..881bec748a 100644 --- a/epan/dissectors/packet-2dparityfec.c +++ b/epan/dissectors/packet-2dparityfec.c @@ -61,9 +61,7 @@ ** Mark Lewis - 20th June 2006 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c index d3a769de20..7cbc6f439f 100644 --- a/epan/dissectors/packet-3com-njack.c +++ b/epan/dissectors/packet-3com-njack.c @@ -51,9 +51,7 @@ Specs: Type 0x10 (clear counters resp): M -> S, Magic, type, 00 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c index 537d017e35..04bd4519f7 100644 --- a/epan/dissectors/packet-3com-xns.c +++ b/epan/dissectors/packet-3com-xns.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/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c index 663972ca32..fbc0464325 100644 --- a/epan/dissectors/packet-3g-a11.c +++ b/epan/dissectors/packet-3g-a11.c @@ -39,9 +39,7 @@ * http://www.3gpp2.org/Public_html/specs/A00-20110419-002Er0%20A.S0008-C%20v4.0%20HRPD%20IOS-Pub_20110513.pdf */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 53371c7639..9c86b319b9 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -23,9 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* Need to get headers for AF_INET6 and inet_pton() */ #ifdef HAVE_SYS_TYPES_H diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index 50d6f30a4a..32d8676acb 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.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/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c index 09d5cd6861..ab2a0f76b6 100644 --- a/epan/dissectors/packet-HI2Operations.c +++ b/epan/dissectors/packet-HI2Operations.c @@ -31,9 +31,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/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c index b123fbd1c2..a4f9c511f2 100644 --- a/epan/dissectors/packet-aarp.c +++ b/epan/dissectors/packet-aarp.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> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-aastra-aasp.c b/epan/dissectors/packet-aastra-aasp.c index 4b72a21282..6f29f36220 100644 --- a/epan/dissectors/packet-aastra-aasp.c +++ b/epan/dissectors/packet-aastra-aasp.c @@ -28,9 +28,7 @@ * Content-Type: message/x-aasp-signalling */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c index 77fb3c1535..9ef6c8ccd2 100644 --- a/epan/dissectors/packet-acap.c +++ b/epan/dissectors/packet-acap.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/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index c2004b604c..8c5e59d280 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -39,9 +39,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index c7c2cc2b28..dd0accf82c 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -31,9 +31,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/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 9ed8b441fb..3378aa27fa 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -42,9 +42,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/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c index 06afd7c879..e14976308f 100644 --- a/epan/dissectors/packet-actrace.c +++ b/epan/dissectors/packet-actrace.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/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c index 290f58f1d2..82102b1ff5 100644 --- a/epan/dissectors/packet-adwin-config.c +++ b/epan/dissectors/packet-adwin-config.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 <string.h> diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c index a239f53901..29dd0b7aac 100644 --- a/epan/dissectors/packet-adwin.c +++ b/epan/dissectors/packet-adwin.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" /* includes needed for wireshark */ #include <glib.h> diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index f3a75d0c21..0a03482bfe 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.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 <string.h> diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index 6f9d3642eb..f1f937bd35 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -31,9 +31,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/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c index ca40d2e76c..65ff1cc8f1 100644 --- a/epan/dissectors/packet-agentx.c +++ b/epan/dissectors/packet-agentx.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 <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-aim-admin.c b/epan/dissectors/packet-aim-admin.c index bd37cdde34..85d5279f98 100644 --- a/epan/dissectors/packet-aim-admin.c +++ b/epan/dissectors/packet-aim-admin.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/epan/dissectors/packet-aim-adverts.c b/epan/dissectors/packet-aim-adverts.c index 94dacf28cf..2fd3c71a8f 100644 --- a/epan/dissectors/packet-aim-adverts.c +++ b/epan/dissectors/packet-aim-adverts.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/epan/dissectors/packet-aim-bos.c b/epan/dissectors/packet-aim-bos.c index fc6734e60f..c089418aa6 100644 --- a/epan/dissectors/packet-aim-bos.c +++ b/epan/dissectors/packet-aim-bos.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/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c index f2f637c5a2..b482ea576d 100644 --- a/epan/dissectors/packet-aim-buddylist.c +++ b/epan/dissectors/packet-aim-buddylist.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/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c index 125c5f89bc..dc0914ac7f 100644 --- a/epan/dissectors/packet-aim-chat.c +++ b/epan/dissectors/packet-aim-chat.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> diff --git a/epan/dissectors/packet-aim-chatnav.c b/epan/dissectors/packet-aim-chatnav.c index 256a08c7b9..590e73c193 100644 --- a/epan/dissectors/packet-aim-chatnav.c +++ b/epan/dissectors/packet-aim-chatnav.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/epan/dissectors/packet-aim-directory.c b/epan/dissectors/packet-aim-directory.c index fed901b4a9..e168e51cd3 100644 --- a/epan/dissectors/packet-aim-directory.c +++ b/epan/dissectors/packet-aim-directory.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/epan/dissectors/packet-aim-email.c b/epan/dissectors/packet-aim-email.c index 654ec0f308..344876436c 100644 --- a/epan/dissectors/packet-aim-email.c +++ b/epan/dissectors/packet-aim-email.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/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c index c2f3ef7f87..33a48d9b10 100644 --- a/epan/dissectors/packet-aim-generic.c +++ b/epan/dissectors/packet-aim-generic.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/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c index f5766157b0..5c41a1afb5 100644 --- a/epan/dissectors/packet-aim-icq.c +++ b/epan/dissectors/packet-aim-icq.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/epan/dissectors/packet-aim-invitation.c b/epan/dissectors/packet-aim-invitation.c index 1fc9612eec..da63316723 100644 --- a/epan/dissectors/packet-aim-invitation.c +++ b/epan/dissectors/packet-aim-invitation.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/epan/dissectors/packet-aim-location.c b/epan/dissectors/packet-aim-location.c index f32863e7b7..0320e3d8fa 100644 --- a/epan/dissectors/packet-aim-location.c +++ b/epan/dissectors/packet-aim-location.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> diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c index 3dd03de6b5..5caf2e129a 100644 --- a/epan/dissectors/packet-aim-messaging.c +++ b/epan/dissectors/packet-aim-messaging.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> diff --git a/epan/dissectors/packet-aim-oft.c b/epan/dissectors/packet-aim-oft.c index dc1b996963..d6793bbbfe 100644 --- a/epan/dissectors/packet-aim-oft.c +++ b/epan/dissectors/packet-aim-oft.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/epan/dissectors/packet-aim-popup.c b/epan/dissectors/packet-aim-popup.c index 60390efaa8..5949c1fa2d 100644 --- a/epan/dissectors/packet-aim-popup.c +++ b/epan/dissectors/packet-aim-popup.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/epan/dissectors/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c index 88f9c82f6a..736fa1e6d7 100644 --- a/epan/dissectors/packet-aim-signon.c +++ b/epan/dissectors/packet-aim-signon.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> diff --git a/epan/dissectors/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c index b365cc388a..2d0d988e37 100644 --- a/epan/dissectors/packet-aim-ssi.c +++ b/epan/dissectors/packet-aim-ssi.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> diff --git a/epan/dissectors/packet-aim-sst.c b/epan/dissectors/packet-aim-sst.c index 7a1e6c880f..de1273f50a 100644 --- a/epan/dissectors/packet-aim-sst.c +++ b/epan/dissectors/packet-aim-sst.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/epan/dissectors/packet-aim-stats.c b/epan/dissectors/packet-aim-stats.c index 5442e70c7f..a9712735d3 100644 --- a/epan/dissectors/packet-aim-stats.c +++ b/epan/dissectors/packet-aim-stats.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/epan/dissectors/packet-aim-translate.c b/epan/dissectors/packet-aim-translate.c index e9460f72b7..4fa2e75757 100644 --- a/epan/dissectors/packet-aim-translate.c +++ b/epan/dissectors/packet-aim-translate.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/epan/dissectors/packet-aim-userlookup.c b/epan/dissectors/packet-aim-userlookup.c index 56d2864a0d..c2bf6a1877 100644 --- a/epan/dissectors/packet-aim-userlookup.c +++ b/epan/dissectors/packet-aim-userlookup.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/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 087d11bf7d..d73e647806 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.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> #include <ctype.h> diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index a0bf505155..2006511295 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.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 <stdlib.h> diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c index f515d1dee9..32c92adefa 100644 --- a/epan/dissectors/packet-alcap.c +++ b/epan/dissectors/packet-alcap.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 <glib.h> diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 0d60a66641..48a861fb14 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -36,9 +36,7 @@ * for specifications for various versions of the AMQP protocol. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c index 49df6b501f..09c5ab60fa 100644 --- a/epan/dissectors/packet-amr.c +++ b/epan/dissectors/packet-amr.c @@ -27,9 +27,7 @@ * 3GPP TS 26.101 for AMR-NB, 3GPP TS 26.201 for AMR-WB */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index 821a7dcec5..f2ec06d34f 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -29,9 +29,7 @@ * 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/prefs.h> diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c index a80e6a2f6b..f6e1aa300f 100644 --- a/epan/dissectors/packet-ans.c +++ b/epan/dissectors/packet-ans.c @@ -43,9 +43,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c index 3f5f10d3fd..8a1eff4956 100644 --- a/epan/dissectors/packet-ansi_637.c +++ b/epan/dissectors/packet-ansi_637.c @@ -30,9 +30,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/emem.h> diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c index 71b9b93155..e457aae399 100644 --- a/epan/dissectors/packet-ansi_683.c +++ b/epan/dissectors/packet-ansi_683.c @@ -30,9 +30,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/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c index 0bd045323a..b78b6e1f61 100644 --- a/epan/dissectors/packet-ansi_801.c +++ b/epan/dissectors/packet-ansi_801.c @@ -33,9 +33,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> diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index 245450b364..77f1b7a3a1 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.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 "config.h" #include <string.h> diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index d52e5af670..624eb77545 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -92,9 +92,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index fc7f6dabd0..83707e2d76 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -32,9 +32,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/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index 61ea357591..544f6dfd8a 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.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" #ifdef HAVE_STDDEF_H #include <stddef.h> diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c index 64f694ff99..556a9aaa1f 100644 --- a/epan/dissectors/packet-aoe.c +++ b/epan/dissectors/packet-aoe.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 "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c index 99dda5af7c..96393015db 100644 --- a/epan/dissectors/packet-ap1394.c +++ b/epan/dissectors/packet-ap1394.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/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c index 1ae28caed1..fbd8c2e6f1 100644 --- a/epan/dissectors/packet-app-pkix-cert.c +++ b/epan/dissectors/packet-app-pkix-cert.c @@ -28,9 +28,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c index 560016f956..82edb45ed6 100644 --- a/epan/dissectors/packet-applemidi.c +++ b/epan/dissectors/packet-applemidi.c @@ -48,9 +48,7 @@ * http://www.faqs.org/rfcs/rfc6295.html */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c index 09f22f3c92..56dfe25471 100644 --- a/epan/dissectors/packet-aprs.c +++ b/epan/dissectors/packet-aprs.c @@ -39,9 +39,7 @@ * with the base file built from README.developers. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index d18420b447..4ecc0c4b8b 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.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/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c index 46a1c9184a..bcffecd62e 100644 --- a/epan/dissectors/packet-armagetronad.c +++ b/epan/dissectors/packet-armagetronad.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/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 4ca679aa3d..5eb13b560e 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.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> #include <glib.h> diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index be8804105d..b6560d0e0b 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -26,9 +26,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c index 1f8d944476..7ad9e8aa30 100644 --- a/epan/dissectors/packet-aruba-adp.c +++ b/epan/dissectors/packet-aruba-adp.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/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c index df8690074d..889799ad3a 100644 --- a/epan/dissectors/packet-aruba-erm.c +++ b/epan/dissectors/packet-aruba-erm.c @@ -39,9 +39,7 @@ * Following with 802.11 header */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c index 695e041909..eafec4ec3b 100644 --- a/epan/dissectors/packet-aruba-papi.c +++ b/epan/dissectors/packet-aruba-papi.c @@ -24,9 +24,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #if 0 /* Include only as needed */ diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c index bba9f5bb44..fd71169ec8 100644 --- a/epan/dissectors/packet-asap.c +++ b/epan/dissectors/packet-asap.c @@ -40,9 +40,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/sctpppids.h> diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c index 9644db32fd..601536766b 100644 --- a/epan/dissectors/packet-ascend.c +++ b/epan/dissectors/packet-ascend.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c index 9243bffcf7..5ef665cd6a 100644 --- a/epan/dissectors/packet-asf.c +++ b/epan/dissectors/packet-asf.c @@ -27,9 +27,7 @@ * 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 63879dc43b..7a6d747383 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.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> diff --git a/epan/dissectors/packet-at.c b/epan/dissectors/packet-at.c index 1b9409a6b3..ff53116d90 100644 --- a/epan/dissectors/packet-at.c +++ b/epan/dissectors/packet-at.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 3c41543054..d30ce4df37 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.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/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index 120299441f..cbc4de477a 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.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/epan/dissectors/packet-atmtcp.c b/epan/dissectors/packet-atmtcp.c index 7671579ccb..ab01c4b308 100644 --- a/epan/dissectors/packet-atmtcp.c +++ b/epan/dissectors/packet-atmtcp.c @@ -28,9 +28,7 @@ * http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=blob;f=drivers/atm/atmtcp.c;hb=HEAD */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c index 3cbb85e53b..9492a1e03c 100644 --- a/epan/dissectors/packet-auto_rp.c +++ b/epan/dissectors/packet-auto_rp.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/epan/dissectors/packet-ax25-kiss.c b/epan/dissectors/packet-ax25-kiss.c index 49bbd8fb61..8d0e264780 100644 --- a/epan/dissectors/packet-ax25-kiss.c +++ b/epan/dissectors/packet-ax25-kiss.c @@ -101,9 +101,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-ax25-nol3.c b/epan/dissectors/packet-ax25-nol3.c index 881afa529f..6f3151b1bf 100644 --- a/epan/dissectors/packet-ax25-nol3.c +++ b/epan/dissectors/packet-ax25-nol3.c @@ -46,9 +46,7 @@ * with the base file built from README.developers. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c index 9124e13201..9c6f66049d 100644 --- a/epan/dissectors/packet-ax25.c +++ b/epan/dissectors/packet-ax25.c @@ -44,9 +44,7 @@ * with the base file built from README.developers. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-ax4000.c b/epan/dissectors/packet-ax4000.c index 1b60a48a72..5a42446cb6 100644 --- a/epan/dissectors/packet-ax4000.c +++ b/epan/dissectors/packet-ax4000.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/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c index e31532abe8..4f1627cf24 100644 --- a/epan/dissectors/packet-ayiya.c +++ b/epan/dissectors/packet-ayiya.c @@ -25,9 +25,7 @@ * ref: http://unfix.org/~jeroen/archive/drafts/draft-massar-v6ops-ayiya-02.html#anchor4 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-babel.c b/epan/dissectors/packet-babel.c index 147aefb747..cb2507bdc6 100644 --- a/epan/dissectors/packet-babel.c +++ b/epan/dissectors/packet-babel.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 97d89af8ed..b70a0424bd 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.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 <glib.h> diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c index 24f6fbfca6..157839862a 100644 --- a/epan/dissectors/packet-bacnet.c +++ b/epan/dissectors/packet-bacnet.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> diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c index 3070a013b4..09148b34e6 100644 --- a/epan/dissectors/packet-banana.c +++ b/epan/dissectors/packet-banana.c @@ -28,9 +28,7 @@ * http://twistedmatrix.com/projects/core/documentation/specifications/banana.html */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c index 2a46690281..7fdca98d2b 100644 --- a/epan/dissectors/packet-bat.c +++ b/epan/dissectors/packet-bat.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/prefs.h> diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index 3cf7b39358..f63c2bb60c 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.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/prefs.h> diff --git a/epan/dissectors/packet-bctp.c b/epan/dissectors/packet-bctp.c index 1ef338e899..49af976daa 100644 --- a/epan/dissectors/packet-bctp.c +++ b/epan/dissectors/packet-bctp.c @@ -27,9 +27,7 @@ * Ref ITU-T Rec. Q.1990 (07/2001) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index c96cdf1a34..f07dac3a1b 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.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 <stdio.h> #include <ctype.h> diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index f695d1aff1..a23f05c32d 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -57,9 +57,7 @@ /*#define DEBUG_BER 1*/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/epan/dissectors/packet-bfcp.c b/epan/dissectors/packet-bfcp.c index d2b1dd8748..589d70e166 100644 --- a/epan/dissectors/packet-bfcp.c +++ b/epan/dissectors/packet-bfcp.c @@ -24,9 +24,7 @@ * * BFCP Message structure is defined in RFC 4582. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index 180c89b8a8..7098ff54ad 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.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> diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index a9bf147ab8..9c2c960463 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -49,9 +49,7 @@ * RFC1863 A BGP/IDRP Route Server alternative to a full mesh routing */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c index a91fe3f305..ffc7d8c4f6 100644 --- a/epan/dissectors/packet-bittorrent.c +++ b/epan/dissectors/packet-bittorrent.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/prefs.h> diff --git a/epan/dissectors/packet-bjnp.c b/epan/dissectors/packet-bjnp.c index 0d701c1669..ed70c024ea 100644 --- a/epan/dissectors/packet-bjnp.c +++ b/epan/dissectors/packet-bjnp.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/packet.h> diff --git a/epan/dissectors/packet-bmc.c b/epan/dissectors/packet-bmc.c index 874c9ceb51..64db874651 100644 --- a/epan/dissectors/packet-bmc.c +++ b/epan/dissectors/packet-bmc.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c index 8361a22197..ce4e4ca99a 100644 --- a/epan/dissectors/packet-bofl.c +++ b/epan/dissectors/packet-bofl.c @@ -40,9 +40,7 @@ * 6 6 2 4 4 n bytes */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 40f11f4da1..e76661b6ee 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -87,9 +87,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-bootparams.c b/epan/dissectors/packet-bootparams.c index f2d68ee3da..0e31ce7e68 100644 --- a/epan/dissectors/packet-bootparams.c +++ b/epan/dissectors/packet-bootparams.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/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index c14369337a..962d544a45 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.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/epan/dissectors/packet-bpq.c b/epan/dissectors/packet-bpq.c index f34aaa0d6e..8abf73317b 100644 --- a/epan/dissectors/packet-bpq.c +++ b/epan/dissectors/packet-bpq.c @@ -35,9 +35,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index 301dbd4938..38c3a979fe 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.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/epan/dissectors/packet-brp.c b/epan/dissectors/packet-brp.c index 953568ab9a..434937eacb 100644 --- a/epan/dissectors/packet-brp.c +++ b/epan/dissectors/packet-brp.c @@ -28,9 +28,7 @@ * VoD server at the video head-end. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index ccb782f06c..820958b2d2 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -31,9 +31,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/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 6b0595aaa5..48dcbafcbf 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -25,9 +25,7 @@ /* 3GPP TS 48.018 V 6.5.0 (2004-07) Release 6 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c index 2b620b77b0..cce92d23fb 100644 --- a/epan/dissectors/packet-bt-dht.c +++ b/epan/dissectors/packet-bt-dht.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 <epan/packet.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c index fc89fc7399..cc985d27ce 100644 --- a/epan/dissectors/packet-bt-utp.c +++ b/epan/dissectors/packet-bt-utp.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> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index a4c677fac7..e2b7320212 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.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> diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index 9746d134b7..afdf0db70e 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.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/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 2a8f4cae82..9ea885dcb4 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 7dadc0ba9d..383b396888 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -30,9 +30,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 <string.h> diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 1d86785ae7..e4e3cfcc64 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -30,9 +30,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/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index fcbef155ff..e0530ee006 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.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 <epan/packet.h> diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index dc7be3dcf5..1935d3cc03 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.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 <glib.h> diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c index 4d6665ee02..01c96f7867 100644 --- a/epan/dissectors/packet-bthid.c +++ b/epan/dissectors/packet-bthid.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/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 407ab2fc3b..06bf70aeff 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.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 <glib.h> diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 15c7e60771..9171650f1b 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.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> diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 63c27fcb55..b4a7abcdac 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -30,9 +30,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/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index eda4542ebc..393be13d8e 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -27,9 +27,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c index 91bda1aa31..47675de307 100644 --- a/epan/dissectors/packet-bvlc.c +++ b/epan/dissectors/packet-bvlc.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/prefs.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-bzr.c b/epan/dissectors/packet-bzr.c index b811babdce..be1becba3c 100644 --- a/epan/dissectors/packet-bzr.c +++ b/epan/dissectors/packet-bzr.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 491e8ef9f8..a9a9acd141 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -31,9 +31,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/epan/dissectors/packet-calcappprotocol.c b/epan/dissectors/packet-calcappprotocol.c index e5bb066102..14fd11be3c 100644 --- a/epan/dissectors/packet-calcappprotocol.c +++ b/epan/dissectors/packet-calcappprotocol.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 <epan/packet.h> #include <epan/sctpppids.h> diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 802d505c73..a198af3809 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -41,9 +41,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/epan/dissectors/packet-canopen.c b/epan/dissectors/packet-canopen.c index 8bcf9946d9..e4f192b2fd 100644 --- a/epan/dissectors/packet-canopen.c +++ b/epan/dissectors/packet-canopen.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 406b8e2583..cf6e17881e 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.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/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c index 0b79a7ec0f..b0053f898a 100644 --- a/epan/dissectors/packet-cast.c +++ b/epan/dissectors/packet-cast.c @@ -24,9 +24,7 @@ * specification */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 5e052bbdb1..2dd9b5faa8 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.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/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index 5c30c5f772..3d201ae45d 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.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> diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index b3d00e964d..97c00a6ef8 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.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 <string.h> diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c index c08d7604e1..9bf14bcf0f 100644 --- a/epan/dissectors/packet-cdt.c +++ b/epan/dissectors/packet-cdt.c @@ -35,9 +35,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/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c index 6d38f34d07..c68579321d 100644 --- a/epan/dissectors/packet-cell_broadcast.c +++ b/epan/dissectors/packet-cell_broadcast.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> diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c index 8025c836d7..f3948593ac 100644 --- a/epan/dissectors/packet-cfm.c +++ b/epan/dissectors/packet-cfm.c @@ -31,9 +31,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <glib.h> diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c index de1fa6ecd8..69cd352044 100644 --- a/epan/dissectors/packet-cgmp.c +++ b/epan/dissectors/packet-cgmp.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> diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c index 8a394df2f5..8e4738d878 100644 --- a/epan/dissectors/packet-charging_ase.c +++ b/epan/dissectors/packet-charging_ase.c @@ -31,9 +31,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/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index be45ebd619..0ddfa413fb 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.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/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 5701dadf16..ac91512a0a 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -29,9 +29,7 @@ * Brian M. Ames <bmames@apk.net> */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index de854d342f..4e122ad38c 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -28,9 +28,7 @@ * along with this program; if not, write to the Free Software * 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/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c index 0538a6cacd..ea5dc00f32 100644 --- a/epan/dissectors/packet-cimetrics.c +++ b/epan/dissectors/packet-cimetrics.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/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 37c3cb98c4..c5b7e24774 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -38,9 +38,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/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c index 430d0c35f5..4da839f99c 100644 --- a/epan/dissectors/packet-cipmotion.c +++ b/epan/dissectors/packet-cipmotion.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 <epan/packet.h> #include "packet-cip.h" diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index b5742c565a..5481d7aede 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.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 <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c index 6fa44ee4a1..6a12782807 100644 --- a/epan/dissectors/packet-cisco-erspan.c +++ b/epan/dissectors/packet-cisco-erspan.c @@ -57,9 +57,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-cisco-sm.c b/epan/dissectors/packet-cisco-sm.c index 0a50d1e11a..1e4671a781 100644 --- a/epan/dissectors/packet-cisco-sm.c +++ b/epan/dissectors/packet-cisco-sm.c @@ -39,9 +39,7 @@ * here, its just glue to get the ISUP/MTP3 data nicely. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index 2422222f71..0327cddd3f 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -45,9 +45,7 @@ * - Is the TRY/CATCH stuff OK? */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c index 3f895f281d..6b79359426 100644 --- a/epan/dissectors/packet-classicstun.c +++ b/epan/dissectors/packet-classicstun.c @@ -26,9 +26,7 @@ * (supports extra message attributes described in draft-ietf-behave-rfc3489bis-00) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-clearcase.c b/epan/dissectors/packet-clearcase.c index 7df5c8ae57..fce7e7f3e6 100644 --- a/epan/dissectors/packet-clearcase.c +++ b/epan/dissectors/packet-clearcase.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 diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c index e0c42046c2..63daa97904 100644 --- a/epan/dissectors/packet-clip.c +++ b/epan/dissectors/packet-clip.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/epan/dissectors/packet-clique-rm.c b/epan/dissectors/packet-clique-rm.c index ddf4438f87..03b1e44aa2 100644 --- a/epan/dissectors/packet-clique-rm.c +++ b/epan/dissectors/packet-clique-rm.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/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index f62fc3ec37..800037e118 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.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/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 9fed8b2e9e..f051c31610 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -31,9 +31,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/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index e382bbab67..a526073159 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.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/epan/dissectors/packet-cmpp.c b/epan/dissectors/packet-cmpp.c index 65f5785e3a..24e2e60df8 100644 --- a/epan/dissectors/packet-cmpp.c +++ b/epan/dissectors/packet-cmpp.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/dissectors/packet-tcp.h> diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 4950a480c4..4ae6317d34 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.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 "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-cnip.c b/epan/dissectors/packet-cnip.c index 75aff84acf..079442e663 100644 --- a/epan/dissectors/packet-cnip.c +++ b/epan/dissectors/packet-cnip.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> diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index e3f93145b5..a71f0976a4 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.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 <glib.h> diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index df1757f90e..f95f4bd732 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.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> #include <glib.h> diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c index 729a7d5c3b..db89ca7989 100644 --- a/epan/dissectors/packet-componentstatus.c +++ b/epan/dissectors/packet-componentstatus.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 <epan/packet.h> diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 5ead599b9f..c915d02ffb 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -52,9 +52,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-coseventcomm.c b/epan/dissectors/packet-coseventcomm.c index d8d8d8e901..2c6601967a 100644 --- a/epan/dissectors/packet-coseventcomm.c +++ b/epan/dissectors/packet-coseventcomm.c @@ -35,9 +35,7 @@ static int hf_operationrequest = -1;/* Request_Operation field */ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gmodule.h> diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c index 771d94b070..98f2f5bcd4 100644 --- a/epan/dissectors/packet-cosine.c +++ b/epan/dissectors/packet-cosine.c @@ -29,9 +29,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-cosnaming.c b/epan/dissectors/packet-cosnaming.c index 58998823fd..7b4dd6f3fd 100644 --- a/epan/dissectors/packet-cosnaming.c +++ b/epan/dissectors/packet-cosnaming.c @@ -35,9 +35,7 @@ static int hf_operationrequest = -1;/* Request_Operation field */ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gmodule.h> diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index 2231762499..e4e6e160bf 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.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 <glib.h> diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c index e62d041241..de57a6048a 100644 --- a/epan/dissectors/packet-cpha.c +++ b/epan/dissectors/packet-cpha.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/epan/dissectors/packet-credssp.c b/epan/dissectors/packet-credssp.c index c9d42a309d..6f9e94310b 100644 --- a/epan/dissectors/packet-credssp.c +++ b/epan/dissectors/packet-credssp.c @@ -31,9 +31,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/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index c36b102ff4..8f0c7f0c84 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -31,9 +31,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/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c index 092d06e052..baefcd38b2 100644 --- a/epan/dissectors/packet-csm-encaps.c +++ b/epan/dissectors/packet-csm-encaps.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-csn1.c b/epan/dissectors/packet-csn1.c index 0081ccafc5..19ce89fd67 100644 --- a/epan/dissectors/packet-csn1.c +++ b/epan/dissectors/packet-csn1.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/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index 4685626555..58445deeaa 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.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/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c index f9207f673f..1761d0ed30 100644 --- a/epan/dissectors/packet-cups.c +++ b/epan/dissectors/packet-cups.c @@ -23,9 +23,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <ctype.h> diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index e8d8e67d13..0f840d67eb 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.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/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index 199679051b..b05d13802e 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -31,9 +31,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/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c index bae3110fdc..9a32c269f6 100644 --- a/epan/dissectors/packet-data.c +++ b/epan/dissectors/packet-data.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/prefs.h> diff --git a/epan/dissectors/packet-daytime.c b/epan/dissectors/packet-daytime.c index 2719282dc8..d9c62d967a 100644 --- a/epan/dissectors/packet-daytime.c +++ b/epan/dissectors/packet-daytime.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/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c index 90377a9792..72b03c3bfe 100644 --- a/epan/dissectors/packet-db-lsp.c +++ b/epan/dissectors/packet-db-lsp.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/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c index edc01ca6fc..a7cb69d2e6 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.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 <epan/packet.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index 891212d5bf..7f8532d75f 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index d2fa38fec8..380e4e713c 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -48,9 +48,7 @@ * (Francesco Fondelli) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c index 649fcfaf06..3fb1d09263 100644 --- a/epan/dissectors/packet-dcerpc-atsvc.c +++ b/epan/dissectors/packet-dcerpc-atsvc.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-bossvr.c b/epan/dissectors/packet-dcerpc-bossvr.c index e53fa82883..99117468b7 100644 --- a/epan/dissectors/packet-dcerpc-bossvr.c +++ b/epan/dissectors/packet-dcerpc-bossvr.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> diff --git a/epan/dissectors/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c index 31e09183a0..418701e695 100644 --- a/epan/dissectors/packet-dcerpc-browser.c +++ b/epan/dissectors/packet-dcerpc-browser.c @@ -27,9 +27,7 @@ * in capitals. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dcerpc-budb.c b/epan/dissectors/packet-dcerpc-budb.c index 6e8b99d56c..239928dd45 100644 --- a/epan/dissectors/packet-dcerpc-budb.c +++ b/epan/dissectors/packet-dcerpc-budb.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 <glib.h> #include <string.h> diff --git a/epan/dissectors/packet-dcerpc-butc.c b/epan/dissectors/packet-dcerpc-butc.c index f5ec77d75e..f1163222dc 100644 --- a/epan/dissectors/packet-dcerpc-butc.c +++ b/epan/dissectors/packet-dcerpc-butc.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 <string.h> diff --git a/epan/dissectors/packet-dcerpc-cds_clerkserver.c b/epan/dissectors/packet-dcerpc-cds_clerkserver.c index a969da677d..a7c052b4b3 100644 --- a/epan/dissectors/packet-dcerpc-cds_clerkserver.c +++ b/epan/dissectors/packet-dcerpc-cds_clerkserver.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 <glib.h> diff --git a/epan/dissectors/packet-dcerpc-cds_solicit.c b/epan/dissectors/packet-dcerpc-cds_solicit.c index 89eb0b93be..aeba735d79 100644 --- a/epan/dissectors/packet-dcerpc-cds_solicit.c +++ b/epan/dissectors/packet-dcerpc-cds_solicit.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 <glib.h> diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c index e539b89c9c..2ea3f59c2b 100644 --- a/epan/dissectors/packet-dcerpc-conv.c +++ b/epan/dissectors/packet-dcerpc-conv.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/epan/dissectors/packet-dcerpc-cprpc_server.c b/epan/dissectors/packet-dcerpc-cprpc_server.c index 9e8ab140b6..ab62ad93fc 100644 --- a/epan/dissectors/packet-dcerpc-cprpc_server.c +++ b/epan/dissectors/packet-dcerpc-cprpc_server.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 <glib.h> diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c index 9c22c1b46d..ee0f5dedac 100644 --- a/epan/dissectors/packet-dcerpc-dfs.c +++ b/epan/dissectors/packet-dcerpc-dfs.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c index a487fb5a6e..6d27e7d08f 100644 --- a/epan/dissectors/packet-dcerpc-dnsserver.c +++ b/epan/dissectors/packet-dcerpc-dnsserver.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-drsuapi.c b/epan/dissectors/packet-dcerpc-drsuapi.c index 6ec77630c3..64fee52774 100644 --- a/epan/dissectors/packet-dcerpc-drsuapi.c +++ b/epan/dissectors/packet-dcerpc-drsuapi.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 <glib.h> #include <string.h> diff --git a/epan/dissectors/packet-dcerpc-dssetup.c b/epan/dissectors/packet-dcerpc-dssetup.c index d63c584463..db21703d9d 100644 --- a/epan/dissectors/packet-dcerpc-dssetup.c +++ b/epan/dissectors/packet-dcerpc-dssetup.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <string.h> diff --git a/epan/dissectors/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c index 313b1f19b0..79edc510a8 100644 --- a/epan/dissectors/packet-dcerpc-dtsprovider.c +++ b/epan/dissectors/packet-dcerpc-dtsprovider.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 <glib.h> diff --git a/epan/dissectors/packet-dcerpc-dtsstime_req.c b/epan/dissectors/packet-dcerpc-dtsstime_req.c index 9dd14cb834..1dd3bb67af 100644 --- a/epan/dissectors/packet-dcerpc-dtsstime_req.c +++ b/epan/dissectors/packet-dcerpc-dtsstime_req.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 <glib.h> diff --git a/epan/dissectors/packet-dcerpc-efs.c b/epan/dissectors/packet-dcerpc-efs.c index 4d59d08aaf..9f24c2dbd8 100644 --- a/epan/dissectors/packet-dcerpc-efs.c +++ b/epan/dissectors/packet-dcerpc-efs.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index 1c334f042d..d6dd0a441a 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.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/epan/dissectors/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c index b9deb15f7d..01d0faa8d2 100644 --- a/epan/dissectors/packet-dcerpc-eventlog.c +++ b/epan/dissectors/packet-dcerpc-eventlog.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c index 2d7dc4fe15..002f98a01f 100644 --- a/epan/dissectors/packet-dcerpc-fileexp.c +++ b/epan/dissectors/packet-dcerpc-fileexp.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> diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c index e94ff5db6d..581d4bc5dd 100644 --- a/epan/dissectors/packet-dcerpc-fldb.c +++ b/epan/dissectors/packet-dcerpc-fldb.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> diff --git a/epan/dissectors/packet-dcerpc-frsapi.c b/epan/dissectors/packet-dcerpc-frsapi.c index 9e347aa190..6c860b86c3 100644 --- a/epan/dissectors/packet-dcerpc-frsapi.c +++ b/epan/dissectors/packet-dcerpc-frsapi.c @@ -24,9 +24,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c index 07c821f0de..dd53d5900b 100644 --- a/epan/dissectors/packet-dcerpc-frsrpc.c +++ b/epan/dissectors/packet-dcerpc-frsrpc.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-frstrans.c b/epan/dissectors/packet-dcerpc-frstrans.c index ec84e9978c..de8e08c7a1 100644 --- a/epan/dissectors/packet-dcerpc-frstrans.c +++ b/epan/dissectors/packet-dcerpc-frstrans.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-ftserver.c b/epan/dissectors/packet-dcerpc-ftserver.c index 3564d5c729..9614debdc3 100644 --- a/epan/dissectors/packet-dcerpc-ftserver.c +++ b/epan/dissectors/packet-dcerpc-ftserver.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> diff --git a/epan/dissectors/packet-dcerpc-icl_rpc.c b/epan/dissectors/packet-dcerpc-icl_rpc.c index 820825ecc3..0da7f667bc 100644 --- a/epan/dissectors/packet-dcerpc-icl_rpc.c +++ b/epan/dissectors/packet-dcerpc-icl_rpc.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 <glib.h> diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c index 801422d46a..dec43daf42 100644 --- a/epan/dissectors/packet-dcerpc-initshutdown.c +++ b/epan/dissectors/packet-dcerpc-initshutdown.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c index adfd3b7d8c..0c84778c3a 100644 --- a/epan/dissectors/packet-dcerpc-krb5rpc.c +++ b/epan/dissectors/packet-dcerpc-krb5rpc.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> diff --git a/epan/dissectors/packet-dcerpc-llb.c b/epan/dissectors/packet-dcerpc-llb.c index f6eca7b281..727dddd346 100644 --- a/epan/dissectors/packet-dcerpc-llb.c +++ b/epan/dissectors/packet-dcerpc-llb.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> diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c index f1d25a2375..8f75f84622 100644 --- a/epan/dissectors/packet-dcerpc-lsa.c +++ b/epan/dissectors/packet-dcerpc-lsa.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c index 154aaba5cc..18f3c80aa8 100644 --- a/epan/dissectors/packet-dcerpc-mapi.c +++ b/epan/dissectors/packet-dcerpc-mapi.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-messenger.c b/epan/dissectors/packet-dcerpc-messenger.c index 6327f0bdb6..a5a492fd3d 100644 --- a/epan/dissectors/packet-dcerpc-messenger.c +++ b/epan/dissectors/packet-dcerpc-messenger.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 "packet-dcerpc.h" diff --git a/epan/dissectors/packet-dcerpc-mgmt.c b/epan/dissectors/packet-dcerpc-mgmt.c index 1829faf762..9794e34138 100644 --- a/epan/dissectors/packet-dcerpc-mgmt.c +++ b/epan/dissectors/packet-dcerpc-mgmt.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 <stdio.h> #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dcerpc-ndr.c b/epan/dissectors/packet-dcerpc-ndr.c index 37499d359f..912aebfc60 100644 --- a/epan/dissectors/packet-dcerpc-ndr.c +++ b/epan/dissectors/packet-dcerpc-ndr.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/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index 74e7ba45ec..ef7031f878 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.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/epan/dissectors/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c index b291e8dbf1..286e8dc7c6 100644 --- a/epan/dissectors/packet-dcerpc-nspi.c +++ b/epan/dissectors/packet-dcerpc-nspi.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <string.h> diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index 59a3debfaf..c64ff1a49a 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.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 <string.h> diff --git a/epan/dissectors/packet-dcerpc-pnp.c b/epan/dissectors/packet-dcerpc-pnp.c index 53e62d2e7a..db9b7cc4cc 100644 --- a/epan/dissectors/packet-dcerpc-pnp.c +++ b/epan/dissectors/packet-dcerpc-pnp.c @@ -24,9 +24,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dcerpc-rdaclif.c b/epan/dissectors/packet-dcerpc-rdaclif.c index b1812a1082..00eed0ddd0 100644 --- a/epan/dissectors/packet-dcerpc-rdaclif.c +++ b/epan/dissectors/packet-dcerpc-rdaclif.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> diff --git a/epan/dissectors/packet-dcerpc-rep_proc.c b/epan/dissectors/packet-dcerpc-rep_proc.c index 56672e398f..69096ce8c7 100644 --- a/epan/dissectors/packet-dcerpc-rep_proc.c +++ b/epan/dissectors/packet-dcerpc-rep_proc.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> diff --git a/epan/dissectors/packet-dcerpc-rfr.c b/epan/dissectors/packet-dcerpc-rfr.c index d16cf3b7f6..6fd6f57275 100644 --- a/epan/dissectors/packet-dcerpc-rfr.c +++ b/epan/dissectors/packet-dcerpc-rfr.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-roverride.c b/epan/dissectors/packet-dcerpc-roverride.c index fb056fba2e..c54ef28482 100644 --- a/epan/dissectors/packet-dcerpc-roverride.c +++ b/epan/dissectors/packet-dcerpc-roverride.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> diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c index 78f3d33138..9a5f87d325 100644 --- a/epan/dissectors/packet-dcerpc-rpriv.c +++ b/epan/dissectors/packet-dcerpc-rpriv.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> diff --git a/epan/dissectors/packet-dcerpc-rras.c b/epan/dissectors/packet-dcerpc-rras.c index baff070816..eb9fd9f37b 100644 --- a/epan/dissectors/packet-dcerpc-rras.c +++ b/epan/dissectors/packet-dcerpc-rras.c @@ -24,9 +24,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c index 21417e7795..06b8647d21 100644 --- a/epan/dissectors/packet-dcerpc-rs_acct.c +++ b/epan/dissectors/packet-dcerpc-rs_acct.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> diff --git a/epan/dissectors/packet-dcerpc-rs_attr.c b/epan/dissectors/packet-dcerpc-rs_attr.c index 2faaf25daf..4517c025e9 100644 --- a/epan/dissectors/packet-dcerpc-rs_attr.c +++ b/epan/dissectors/packet-dcerpc-rs_attr.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> diff --git a/epan/dissectors/packet-dcerpc-rs_attr_schema.c b/epan/dissectors/packet-dcerpc-rs_attr_schema.c index 649694bb1c..92d0766774 100644 --- a/epan/dissectors/packet-dcerpc-rs_attr_schema.c +++ b/epan/dissectors/packet-dcerpc-rs_attr_schema.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> diff --git a/epan/dissectors/packet-dcerpc-rs_bind.c b/epan/dissectors/packet-dcerpc-rs_bind.c index 8410558fee..2c114e19b8 100644 --- a/epan/dissectors/packet-dcerpc-rs_bind.c +++ b/epan/dissectors/packet-dcerpc-rs_bind.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> diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c index 1719c7c81e..bebeb2ed6a 100644 --- a/epan/dissectors/packet-dcerpc-rs_misc.c +++ b/epan/dissectors/packet-dcerpc-rs_misc.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> diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c index 9dfd49124a..48bfdc7836 100644 --- a/epan/dissectors/packet-dcerpc-rs_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_pgo.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> diff --git a/epan/dissectors/packet-dcerpc-rs_plcy.c b/epan/dissectors/packet-dcerpc-rs_plcy.c index 9f66049e61..b4596795b7 100644 --- a/epan/dissectors/packet-dcerpc-rs_plcy.c +++ b/epan/dissectors/packet-dcerpc-rs_plcy.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 <epan/packet.h> diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acct.c b/epan/dissectors/packet-dcerpc-rs_prop_acct.c index 44a5623b34..f5d53b8738 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_acct.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_acct.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 <glib.h> diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acl.c b/epan/dissectors/packet-dcerpc-rs_prop_acl.c index 6fe250903c..bee35abc14 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_acl.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_acl.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> diff --git a/epan/dissectors/packet-dcerpc-rs_prop_attr.c b/epan/dissectors/packet-dcerpc-rs_prop_attr.c index 42cbbe7ba9..4390b6db8c 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_attr.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_attr.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> diff --git a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c index 87cf9a52e9..1497706e94 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_pgo.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> diff --git a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c index 5a7b41d4de..3f7de4cc08 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_plcy.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> diff --git a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c index a6bcadbef5..5a76ef710f 100644 --- a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c +++ b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.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> diff --git a/epan/dissectors/packet-dcerpc-rs_repadm.c b/epan/dissectors/packet-dcerpc-rs_repadm.c index bc35898543..8dcf999cd5 100644 --- a/epan/dissectors/packet-dcerpc-rs_repadm.c +++ b/epan/dissectors/packet-dcerpc-rs_repadm.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> diff --git a/epan/dissectors/packet-dcerpc-rs_replist.c b/epan/dissectors/packet-dcerpc-rs_replist.c index 6886bc6d37..340db00fd5 100644 --- a/epan/dissectors/packet-dcerpc-rs_replist.c +++ b/epan/dissectors/packet-dcerpc-rs_replist.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> diff --git a/epan/dissectors/packet-dcerpc-rs_repmgr.c b/epan/dissectors/packet-dcerpc-rs_repmgr.c index 63907c175a..eb30ad53fb 100644 --- a/epan/dissectors/packet-dcerpc-rs_repmgr.c +++ b/epan/dissectors/packet-dcerpc-rs_repmgr.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> diff --git a/epan/dissectors/packet-dcerpc-rs_unix.c b/epan/dissectors/packet-dcerpc-rs_unix.c index 5ff37475fc..66765d39fc 100644 --- a/epan/dissectors/packet-dcerpc-rs_unix.c +++ b/epan/dissectors/packet-dcerpc-rs_unix.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> diff --git a/epan/dissectors/packet-dcerpc-rsec_login.c b/epan/dissectors/packet-dcerpc-rsec_login.c index 4786e38b2d..73382038ae 100644 --- a/epan/dissectors/packet-dcerpc-rsec_login.c +++ b/epan/dissectors/packet-dcerpc-rsec_login.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> diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index 4f46497fe4..c60e3a52c7 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-secidmap.c b/epan/dissectors/packet-dcerpc-secidmap.c index 8b35828965..17c8ce2594 100644 --- a/epan/dissectors/packet-dcerpc-secidmap.c +++ b/epan/dissectors/packet-dcerpc-secidmap.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> diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index a272e48d93..a6907dc025 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -29,9 +29,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <string.h> diff --git a/epan/dissectors/packet-dcerpc-srvsvc.c b/epan/dissectors/packet-dcerpc-srvsvc.c index 32c2aae24a..4bc5bdd414 100644 --- a/epan/dissectors/packet-dcerpc-srvsvc.c +++ b/epan/dissectors/packet-dcerpc-srvsvc.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-svcctl.c b/epan/dissectors/packet-dcerpc-svcctl.c index 1109f87670..005d40d849 100644 --- a/epan/dissectors/packet-dcerpc-svcctl.c +++ b/epan/dissectors/packet-dcerpc-svcctl.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c index 6d24f0ecb1..23b0454415 100644 --- a/epan/dissectors/packet-dcerpc-tapi.c +++ b/epan/dissectors/packet-dcerpc-tapi.c @@ -26,9 +26,7 @@ * in capitals. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dcerpc-tkn4int.c b/epan/dissectors/packet-dcerpc-tkn4int.c index cec51b18f6..a340d2063f 100644 --- a/epan/dissectors/packet-dcerpc-tkn4int.c +++ b/epan/dissectors/packet-dcerpc-tkn4int.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> diff --git a/epan/dissectors/packet-dcerpc-trksvr.c b/epan/dissectors/packet-dcerpc-trksvr.c index e7aa13cc81..e943eb5384 100644 --- a/epan/dissectors/packet-dcerpc-trksvr.c +++ b/epan/dissectors/packet-dcerpc-trksvr.c @@ -26,9 +26,7 @@ * in capitals. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dcerpc-ubikdisk.c b/epan/dissectors/packet-dcerpc-ubikdisk.c index 1332dd5317..ca1b9caf14 100644 --- a/epan/dissectors/packet-dcerpc-ubikdisk.c +++ b/epan/dissectors/packet-dcerpc-ubikdisk.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> diff --git a/epan/dissectors/packet-dcerpc-ubikvote.c b/epan/dissectors/packet-dcerpc-ubikvote.c index 78f8b4db3f..faae5a3fd4 100644 --- a/epan/dissectors/packet-dcerpc-ubikvote.c +++ b/epan/dissectors/packet-dcerpc-ubikvote.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> diff --git a/epan/dissectors/packet-dcerpc-update.c b/epan/dissectors/packet-dcerpc-update.c index 150c970086..1922bf53fa 100644 --- a/epan/dissectors/packet-dcerpc-update.c +++ b/epan/dissectors/packet-dcerpc-update.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> diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c index 68e09d713b..0c1ac942d7 100644 --- a/epan/dissectors/packet-dcerpc-winreg.c +++ b/epan/dissectors/packet-dcerpc-winreg.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-wkssvc.c b/epan/dissectors/packet-dcerpc-wkssvc.c index 54917e0ad3..db8d215005 100644 --- a/epan/dissectors/packet-dcerpc-wkssvc.c +++ b/epan/dissectors/packet-dcerpc-wkssvc.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc-wzcsvc.c b/epan/dissectors/packet-dcerpc-wzcsvc.c index f7e03c9cab..e52647a722 100644 --- a/epan/dissectors/packet-dcerpc-wzcsvc.c +++ b/epan/dissectors/packet-dcerpc-wzcsvc.c @@ -11,9 +11,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #pragma warning(disable:4005) diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index a60cc9c7bc..28e948dbf4 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -29,9 +29,7 @@ * http://www.opengroup.org/dce/ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 1054604b87..3825726a2c 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -202,9 +202,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c index 94f803bcb6..848fe26682 100644 --- a/epan/dissectors/packet-dcom-dispatch.c +++ b/epan/dissectors/packet-dcom-dispatch.c @@ -24,9 +24,7 @@ /* see packet-dcom.c for details about DCOM */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c index a6cc693fa4..3b1662a8ed 100644 --- a/epan/dissectors/packet-dcom-oxid.c +++ b/epan/dissectors/packet-dcom-oxid.c @@ -25,9 +25,7 @@ /* see packet-dcom.c for details about DCOM */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dcom-remact.c b/epan/dissectors/packet-dcom-remact.c index 084685c6b6..5bc3cedab5 100644 --- a/epan/dissectors/packet-dcom-remact.c +++ b/epan/dissectors/packet-dcom-remact.c @@ -25,9 +25,7 @@ /* see packet-dcom.c for details about DCOM */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c index 616cd75d1e..5d14d2001a 100644 --- a/epan/dissectors/packet-dcom-remunkn.c +++ b/epan/dissectors/packet-dcom-remunkn.c @@ -25,9 +25,7 @@ /* see packet-dcom.c for details about DCOM */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c index da4f098fd0..a514768dd3 100644 --- a/epan/dissectors/packet-dcom-sysact.c +++ b/epan/dissectors/packet-dcom-sysact.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/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index 8329719a59..d41d041023 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -65,9 +65,7 @@ * packet-dcom-sysact.c: ISystemActivator */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* * XXX - are the next two includes necessary? diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index 908e75f939..e228670bfd 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -26,9 +26,7 @@ * Ref: ETSI DCP (ETSI TS 102 821) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c index c2ea891f89..df148953c7 100644 --- a/epan/dissectors/packet-ddtp.c +++ b/epan/dissectors/packet-ddtp.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/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c index 5a48ec5783..f0d8eadf0f 100644 --- a/epan/dissectors/packet-dec-bpdu.c +++ b/epan/dissectors/packet-dec-bpdu.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/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 73aebc1d52..6027c2da15 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -47,9 +47,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/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 3d54dff321..e82fb84eec 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -36,9 +36,7 @@ hack and use a proper capture type. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 998c778039..4aa4de8efa 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -35,9 +35,7 @@ * upon which the handling of the message-digest option is based. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index b2dd716c82..27d8425abb 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -44,9 +44,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/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 2b15f18aa4..31734e0801 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -40,9 +40,7 @@ * http://www.iana.org/assignments/aaa-parameters */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index 7549dafc45..abcec26b6d 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -28,9 +28,7 @@ * the content of AVP:s of the OctetString type(or similar). */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-diffserv-mpls-common.c b/epan/dissectors/packet-diffserv-mpls-common.c index 3f4dceb7b8..15f9e8cca7 100644 --- a/epan/dissectors/packet-diffserv-mpls-common.c +++ b/epan/dissectors/packet-diffserv-mpls-common.c @@ -30,9 +30,7 @@ * protocol are defined in each dissector. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dis-enums.c b/epan/dissectors/packet-dis-enums.c index 0b4216ab13..73d8264833 100644 --- a/epan/dissectors/packet-dis-enums.c +++ b/epan/dissectors/packet-dis-enums.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 "packet-dis-enums.h" #include <epan/value_string.h> diff --git a/epan/dissectors/packet-dis-fields.c b/epan/dissectors/packet-dis-fields.c index 66a8463829..41bdaf96df 100644 --- a/epan/dissectors/packet-dis-fields.c +++ b/epan/dissectors/packet-dis-fields.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> #include "packet-dis-fields.h" diff --git a/epan/dissectors/packet-dis-pdus.c b/epan/dissectors/packet-dis-pdus.c index d977c702e3..da7dded72d 100644 --- a/epan/dissectors/packet-dis-pdus.c +++ b/epan/dissectors/packet-dis-pdus.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 "packet-dis-pdus.h" #include "packet-dis-fields.h" diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c index 884a51d5fd..a63db6ece3 100644 --- a/epan/dissectors/packet-dis.c +++ b/epan/dissectors/packet-dis.c @@ -39,9 +39,7 @@ * Lots more enumerations to implement. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 29c42994c2..3ab795c1d5 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -31,9 +31,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/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index 9a88384f8f..488799b379 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -25,9 +25,7 @@ */ /* This dissector supports version 1 of the DISTCC protocol */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index d92c4b510c..ea0b850ba0 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -45,9 +45,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c index 213f36cdd7..4aa81bf5b4 100644 --- a/epan/dissectors/packet-dlsw.c +++ b/epan/dissectors/packet-dlsw.c @@ -25,9 +25,7 @@ /* DLSw dissector ( RFC 1434, RFC 1795, RFC 2166) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index d01d65312c..f84065da7f 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -36,9 +36,7 @@ * - Add Transmission/Retransmission statistics */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> #include <math.h> diff --git a/epan/dissectors/packet-dmx-chan.c b/epan/dissectors/packet-dmx-chan.c index c7fe31f7f6..c9eb0d37ed 100644 --- a/epan/dissectors/packet-dmx-chan.c +++ b/epan/dissectors/packet-dmx-chan.c @@ -36,9 +36,7 @@ * for Controlling Lighting Equipment and Accessories */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/emem.h> diff --git a/epan/dissectors/packet-dmx-sip.c b/epan/dissectors/packet-dmx-sip.c index 3e354c95ff..bfb93aa273 100644 --- a/epan/dissectors/packet-dmx-sip.c +++ b/epan/dissectors/packet-dmx-sip.c @@ -36,9 +36,7 @@ * for Controlling Lighting Equipment and Accessories */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-dmx-test.c b/epan/dissectors/packet-dmx-test.c index 8ad40d1531..71f4a32c30 100644 --- a/epan/dissectors/packet-dmx-test.c +++ b/epan/dissectors/packet-dmx-test.c @@ -36,9 +36,7 @@ * for Controlling Lighting Equipment and Accessories */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-dmx-text.c b/epan/dissectors/packet-dmx-text.c index da16b48d3f..20ed974169 100644 --- a/epan/dissectors/packet-dmx-text.c +++ b/epan/dissectors/packet-dmx-text.c @@ -36,9 +36,7 @@ * for Controlling Lighting Equipment and Accessories */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-dmx.c b/epan/dissectors/packet-dmx.c index 29e1b2e345..7ba60ed8ec 100644 --- a/epan/dissectors/packet-dmx.c +++ b/epan/dissectors/packet-dmx.c @@ -37,9 +37,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 09709bc84f..0eb6ad1045 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.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 <string.h> #include <math.h> diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 23e3f825aa..197dbd08ee 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -31,9 +31,7 @@ * RFC 4795 for link-local multicast name resolution (LLMNR) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <memory.h> diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index cff9d10628..b0fa09997c 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -31,9 +31,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/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 07e7c55d59..2f43fabd7f 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/emem.h> diff --git a/epan/dissectors/packet-dpnss-link.c b/epan/dissectors/packet-dpnss-link.c index 437a339d4a..bf49a1ee95 100644 --- a/epan/dissectors/packet-dpnss-link.c +++ b/epan/dissectors/packet-dpnss-link.c @@ -27,9 +27,7 @@ * ND1301:2001/03 http://www.nicc.org.uk/nicc-public/Public/interconnectstandards/dpnss/nd1301_2004_11.pdf */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c index 2d0d8975a0..833f515ace 100644 --- a/epan/dissectors/packet-dpnss.c +++ b/epan/dissectors/packet-dpnss.c @@ -29,9 +29,7 @@ * http://acacia-net.com/wwwcla/protocol/dass2_l3.htm */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c index 3955648143..ee99ade802 100644 --- a/epan/dissectors/packet-drda.c +++ b/epan/dissectors/packet-drda.c @@ -47,9 +47,7 @@ * https://www-304.ibm.com/support/docview.wss?uid=pub1sc18985301 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 95014de944..961fd3e3db 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.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/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index cb49d411d5..e06ea387a3 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -31,9 +31,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/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index a864983b37..af78039e45 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -47,9 +47,7 @@ * - add missings things (desegmentation, reordering... that aren't present in actual OpenSSL implementation) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index 311fced350..d4d305d5c3 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -33,9 +33,7 @@ * Ref http://www.ietf.org/rfc/rfc5050.txt?number=5050 */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index 4b53638904..4c5e4d6180 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index f075acac27..ee17681b1d 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.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 <string.h> diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c index 93359c5da7..a187cd0fb6 100644 --- a/epan/dissectors/packet-dua.c +++ b/epan/dissectors/packet-dua.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 "config.h" #include <epan/packet.h> #include <epan/sctpppids.h> diff --git a/epan/dissectors/packet-dvb-ait.c b/epan/dissectors/packet-dvb-ait.c index 25f9070b0c..b46db8d475 100644 --- a/epan/dissectors/packet-dvb-ait.c +++ b/epan/dissectors/packet-dvb-ait.c @@ -26,9 +26,7 @@ /* This dissector processes a DVB Application Information Table (AIT) as * defined in ETSI TS 102 809. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-dvb-bat.c b/epan/dissectors/packet-dvb-bat.c index cff5bd10d0..ae214fd5b6 100644 --- a/epan/dissectors/packet-dvb-bat.c +++ b/epan/dissectors/packet-dvb-bat.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-dvb-data-mpe.c b/epan/dissectors/packet-dvb-data-mpe.c index fd4e7716a9..b5adf8bfdb 100644 --- a/epan/dissectors/packet-dvb-data-mpe.c +++ b/epan/dissectors/packet-dvb-data-mpe.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-dvb-eit.c b/epan/dissectors/packet-dvb-eit.c index 375f678ccc..48068349d9 100644 --- a/epan/dissectors/packet-dvb-eit.c +++ b/epan/dissectors/packet-dvb-eit.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-dvb-ipdc.c b/epan/dissectors/packet-dvb-ipdc.c index 9674ad79e6..d400f30fbb 100644 --- a/epan/dissectors/packet-dvb-ipdc.c +++ b/epan/dissectors/packet-dvb-ipdc.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/epan/dissectors/packet-dvb-nit.c b/epan/dissectors/packet-dvb-nit.c index b949385bc0..3cdab10bd6 100644 --- a/epan/dissectors/packet-dvb-nit.c +++ b/epan/dissectors/packet-dvb-nit.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c index 29ec7f1c08..1539354d8f 100644 --- a/epan/dissectors/packet-dvb-s2-bb.c +++ b/epan/dissectors/packet-dvb-s2-bb.c @@ -29,9 +29,7 @@ * 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/epan/dissectors/packet-dvb-sdt.c b/epan/dissectors/packet-dvb-sdt.c index a4874168c9..9e42385215 100644 --- a/epan/dissectors/packet-dvb-sdt.c +++ b/epan/dissectors/packet-dvb-sdt.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-dvb-tdt.c b/epan/dissectors/packet-dvb-tdt.c index 47d259830b..a7755365ab 100644 --- a/epan/dissectors/packet-dvb-tdt.c +++ b/epan/dissectors/packet-dvb-tdt.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-dvb-tot.c b/epan/dissectors/packet-dvb-tot.c index 9128743dbb..d4219890a8 100644 --- a/epan/dissectors/packet-dvb-tot.c +++ b/epan/dissectors/packet-dvb-tot.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index cf529f3f19..b91ec34ecc 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -31,9 +31,7 @@ * http://www.kaiser.cx/pcap-dvbci.html. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index d652939525..01f4a58cef 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -51,9 +51,7 @@ RFC1075 has typos in 3.12.2 and 3.12.4, see if you can spot them. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-e100.c b/epan/dissectors/packet-e100.c index 7d87dcf20d..05c455345c 100644 --- a/epan/dissectors/packet-e100.c +++ b/epan/dissectors/packet-e100.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/packet.h> diff --git a/epan/dissectors/packet-e164.c b/epan/dissectors/packet-e164.c index 146daabd40..8fab62d151 100644 --- a/epan/dissectors/packet-e164.c +++ b/epan/dissectors/packet-e164.c @@ -27,9 +27,7 @@ * Annex to ITU Operational Bulletin No. 835 - 1.V.2005 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c index 9939020cbf..aa03612157 100644 --- a/epan/dissectors/packet-e212.c +++ b/epan/dissectors/packet-e212.c @@ -29,9 +29,7 @@ * Copyright 2011, Grzegorz Szczytowski <grzegorz.szczytowski@gmail.com> */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index 11c864e33f..7421f4c439 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.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/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index 304bba8403..e66e432dc4 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.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/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c index feaa01eae5..b52b5ca4b4 100644 --- a/epan/dissectors/packet-echo.c +++ b/epan/dissectors/packet-echo.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c index 87b3983f0e..c469592f11 100644 --- a/epan/dissectors/packet-ecp-oui.c +++ b/epan/dissectors/packet-ecp-oui.c @@ -25,9 +25,7 @@ * 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/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index a2dd51f7b7..1cb2ee07d7 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.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 <stdlib.h> diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c index 44c118f3c0..d6e0fa5efb 100644 --- a/epan/dissectors/packet-egd.c +++ b/epan/dissectors/packet-egd.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 <string.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ehdlc.c b/epan/dissectors/packet-ehdlc.c index c8109ebac7..7abdfcf78e 100644 --- a/epan/dissectors/packet-ehdlc.c +++ b/epan/dissectors/packet-ehdlc.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> diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index d2b293700e..467c612413 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.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/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 0ebeb3c4d2..da1343c954 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -26,9 +26,7 @@ * along with this program; if not, write to the Free Software * 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/epan/dissectors/packet-eiss.c b/epan/dissectors/packet-eiss.c index 97271aa4ef..2960c77613 100644 --- a/epan/dissectors/packet-eiss.c +++ b/epan/dissectors/packet-eiss.c @@ -24,9 +24,7 @@ * 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/epan/dissectors/packet-elcom.c b/epan/dissectors/packet-elcom.c index 85e9a18379..1fdb78adb6 100644 --- a/epan/dissectors/packet-elcom.c +++ b/epan/dissectors/packet-elcom.c @@ -28,9 +28,7 @@ * http://www.sintef.no/upload/Energiforskning/Energisystemer/ELCOM%2090.pdf */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c index 4690171a34..261634b38e 100644 --- a/epan/dissectors/packet-enc.c +++ b/epan/dissectors/packet-enc.c @@ -25,9 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 84c03e777e..22d0dc7c76 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.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 "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c index 58e06f80e9..2d49465cce 100644 --- a/epan/dissectors/packet-enrp.c +++ b/epan/dissectors/packet-enrp.c @@ -39,9 +39,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/sctpppids.h> diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c index 74084c5b53..c3e5d645a0 100644 --- a/epan/dissectors/packet-enttec.c +++ b/epan/dissectors/packet-enttec.c @@ -26,9 +26,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index b60240604e..413f797dfb 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -37,9 +37,7 @@ */ -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c index 9918a4ccdc..3de9fd96ac 100644 --- a/epan/dissectors/packet-epl_v1.c +++ b/epan/dissectors/packet-epl_v1.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c index 1d9f1257ad..172527f936 100644 --- a/epan/dissectors/packet-epmd.c +++ b/epan/dissectors/packet-epmd.c @@ -31,9 +31,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/conversation.h> diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index 3e9249eab9..4f05849bf4 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.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/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c index a286503bf6..233898ea13 100644 --- a/epan/dissectors/packet-erldp.c +++ b/epan/dissectors/packet-erldp.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/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c index 497e0b793f..8362ea9e42 100644 --- a/epan/dissectors/packet-esio.c +++ b/epan/dissectors/packet-esio.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/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c index d1a774d50f..c350a5d954 100644 --- a/epan/dissectors/packet-esis.c +++ b/epan/dissectors/packet-esis.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/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index 080a61833b..452d6d9d3f 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.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 "config.h" #include <glib.h> #include <string.h> diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c index 8164ccd5e6..0efc445f0e 100644 --- a/epan/dissectors/packet-etch.c +++ b/epan/dissectors/packet-etch.c @@ -33,9 +33,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 1c26db8f50..568f1bad06 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.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/epan/dissectors/packet-etherip.c b/epan/dissectors/packet-etherip.c index 417f265313..250f78ce30 100644 --- a/epan/dissectors/packet-etherip.c +++ b/epan/dissectors/packet-etherip.c @@ -23,9 +23,7 @@ * * $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 6a357cd343..fb1db62d9f 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.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/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c index 91df178395..c6ee36a1a4 100644 --- a/epan/dissectors/packet-etsi_card_app_toolkit.c +++ b/epan/dissectors/packet-etsi_card_app_toolkit.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> diff --git a/epan/dissectors/packet-etv.c b/epan/dissectors/packet-etv.c index 39c6be29b1..1af9753d6a 100644 --- a/epan/dissectors/packet-etv.c +++ b/epan/dissectors/packet-etv.c @@ -24,9 +24,7 @@ * 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/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c index 763dc2522e..9e605b7dab 100644 --- a/epan/dissectors/packet-evrc.c +++ b/epan/dissectors/packet-evrc.c @@ -37,9 +37,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/prefs.h> diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c index dc7b8a60bd..9b89480d2d 100644 --- a/epan/dissectors/packet-exec.c +++ b/epan/dissectors/packet-exec.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> diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index ff3f9f1395..008bd27b82 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -140,9 +140,7 @@ These are the structures you will see most often in EDP frames. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 609aa43242..c0f17d2371 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -25,10 +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> diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c index bb4d7721b8..9ca3203480 100644 --- a/epan/dissectors/packet-fcct.c +++ b/epan/dissectors/packet-fcct.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/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 0f4ec91121..14d41d5b11 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.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" #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index 09f8d4abd3..138521adb9 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -28,9 +28,7 @@ * - Decode RNID, RLIR */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index 77e2a0661c..f7b32b6dc4 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.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/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index bfdcdfce54..5148b51c47 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.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/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c index 81415d35f3..4252a3a255 100644 --- a/epan/dissectors/packet-fcgi.c +++ b/epan/dissectors/packet-fcgi.c @@ -23,9 +23,7 @@ * 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/prefs.h> diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 7b5ad5a18f..333741d26c 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.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> diff --git a/epan/dissectors/packet-fclctl.c b/epan/dissectors/packet-fclctl.c index d60fbcb04f..7507b499f8 100644 --- a/epan/dissectors/packet-fclctl.c +++ b/epan/dissectors/packet-fclctl.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/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c index 928b853182..8accf2eb8e 100644 --- a/epan/dissectors/packet-fcoe.c +++ b/epan/dissectors/packet-fcoe.c @@ -30,9 +30,7 @@ * For FCoE protocol details, see http://fcoe.com. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-fcoib.c b/epan/dissectors/packet-fcoib.c index d01fe940f8..53c8aad581 100644 --- a/epan/dissectors/packet-fcoib.c +++ b/epan/dissectors/packet-fcoib.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 <stdlib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 01e1d4cdc6..5de43f8c02 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.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/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index 7bb7a84a83..092166f24d 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.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> diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c index 592391b804..15167c1026 100644 --- a/epan/dissectors/packet-fcsp.c +++ b/epan/dissectors/packet-fcsp.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> diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index f1254c2a83..fe8d0e0187 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.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/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index fe3b1c3912..f06a6358db 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.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> diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index 0991eba267..e7fa6e64fb 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.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> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 126ffb9a24..541493d0e7 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -41,9 +41,7 @@ * --------------------------------------------------------------------- */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index e9432ee805..59618d2959 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -34,9 +34,7 @@ * and http://www.t11.org/ftp/t11/pub/fc/bb-5/08-545v1.pdf */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index 30d3046789..98600f5f37 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> #include <string.h> diff --git a/epan/dissectors/packet-flexnet.c b/epan/dissectors/packet-flexnet.c index 7b7ec4e07d..09ccc4d214 100644 --- a/epan/dissectors/packet-flexnet.c +++ b/epan/dissectors/packet-flexnet.c @@ -36,9 +36,7 @@ * with the base file built from README.developers. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index e7a39dbb1f..6674e5da9d 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -45,9 +45,7 @@ * Bugfix: sorting by protocol didn't always fill in the protocol column. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c index 48c1814f74..df73f1a243 100644 --- a/epan/dissectors/packet-fmp.c +++ b/epan/dissectors/packet-fmp.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 <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c index 4aa33e12ff..d3fad2d10e 100644 --- a/epan/dissectors/packet-fmp_notify.c +++ b/epan/dissectors/packet-fmp_notify.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> diff --git a/epan/dissectors/packet-fmtp.c b/epan/dissectors/packet-fmtp.c index 2235accbc7..1bac14b31c 100644 --- a/epan/dissectors/packet-fmtp.c +++ b/epan/dissectors/packet-fmtp.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 <epan/packet.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-forces.c b/epan/dissectors/packet-forces.c index 8852200aae..688f6862c5 100644 --- a/epan/dissectors/packet-forces.c +++ b/epan/dissectors/packet-forces.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> diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c index f3cc5a06dc..e5e5617da8 100644 --- a/epan/dissectors/packet-fp_hint.c +++ b/epan/dissectors/packet-fp_hint.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 <string.h> diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index c9b316391a..da92cb64cd 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -34,9 +34,7 @@ * http://www.trillium.com/assets/legacyframe/white_paper/8771019.pdf */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c index 7f0b1553aa..729e877daa 100644 --- a/epan/dissectors/packet-fractalgeneratorprotocol.c +++ b/epan/dissectors/packet-fractalgeneratorprotocol.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 <epan/packet.h> #include <epan/sctpppids.h> diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 5fbb4e88be..e38a0a98cf 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.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" #ifdef _MSC_VER #include <windows.h> diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 9a4cb2e9ca..4b4f77c312 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -36,9 +36,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/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index c764ddc0dc..7304710d30 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.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 <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c index 022f280d8b..7e0724638f 100644 --- a/epan/dissectors/packet-fw1.c +++ b/epan/dissectors/packet-fw1.c @@ -82,9 +82,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/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c index de843fbbda..522c0a76af 100644 --- a/epan/dissectors/packet-g723.c +++ b/epan/dissectors/packet-g723.c @@ -25,9 +25,7 @@ * References: */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-gadu-gadu.c b/epan/dissectors/packet-gadu-gadu.c index bd8290f3b8..a0d96f3e32 100644 --- a/epan/dissectors/packet-gadu-gadu.c +++ b/epan/dissectors/packet-gadu-gadu.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 <glib.h> diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index 2c5759138f..662801c83b 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.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/epan/dissectors/packet-ged125.c b/epan/dissectors/packet-ged125.c index c5c4e3686a..f74e966062 100644 --- a/epan/dissectors/packet-ged125.c +++ b/epan/dissectors/packet-ged125.c @@ -40,9 +40,7 @@ * that header have a few other things. One of these things is a sub-message type. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c index db08af9f5a..bbebaa1847 100644 --- a/epan/dissectors/packet-gift.c +++ b/epan/dissectors/packet-gift.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> diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 4be5c04c3d..cad19f5fa1 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -278,9 +278,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <stdio.h> diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c index 97eb4aae7a..a48d1c2482 100644 --- a/epan/dissectors/packet-git.c +++ b/epan/dissectors/packet-git.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 <stdio.h> diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c index ed70a505a5..5c069dbddc 100644 --- a/epan/dissectors/packet-glbp.c +++ b/epan/dissectors/packet-glbp.c @@ -38,9 +38,7 @@ * hello 3000, hold 10000 VF 1 Active pri 167 vMAC 0007.b403.fd01 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-gluster_cli.c b/epan/dissectors/packet-gluster_cli.c index cb7e6cc630..05042950c2 100644 --- a/epan/dissectors/packet-gluster_cli.c +++ b/epan/dissectors/packet-gluster_cli.c @@ -33,9 +33,7 @@ * see http://www.kernel.org/doc/Documentation/CodingStyle. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-gluster_pmap.c b/epan/dissectors/packet-gluster_pmap.c index 8cca6ee04f..d2113bdcca 100644 --- a/epan/dissectors/packet-gluster_pmap.c +++ b/epan/dissectors/packet-gluster_pmap.c @@ -33,9 +33,7 @@ * see http://www.kernel.org/doc/Documentation/CodingStyle. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-glusterd.c b/epan/dissectors/packet-glusterd.c index 914e283c2f..6d9a6321a0 100644 --- a/epan/dissectors/packet-glusterd.c +++ b/epan/dissectors/packet-glusterd.c @@ -35,9 +35,7 @@ * see http://www.kernel.org/doc/Documentation/CodingStyle. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c index 787be24b45..bfaf2310d9 100644 --- a/epan/dissectors/packet-glusterfs.c +++ b/epan/dissectors/packet-glusterfs.c @@ -33,9 +33,7 @@ * see http://www.kernel.org/doc/Documentation/CodingStyle. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c index 8e635a2cad..4e76bfa29b 100644 --- a/epan/dissectors/packet-glusterfs_hndsk.c +++ b/epan/dissectors/packet-glusterfs_hndsk.c @@ -33,9 +33,7 @@ * see http://www.kernel.org/doc/Documentation/CodingStyle. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c index cd613fc6dc..51b3dccfbd 100644 --- a/epan/dissectors/packet-gmhdr.c +++ b/epan/dissectors/packet-gmhdr.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> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-gmr1_bcch.c b/epan/dissectors/packet-gmr1_bcch.c index 9fe8afd912..d95e592698 100644 --- a/epan/dissectors/packet-gmr1_bcch.c +++ b/epan/dissectors/packet-gmr1_bcch.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-gmr1_common.c b/epan/dissectors/packet-gmr1_common.c index ef63b960de..07eb80f83a 100644 --- a/epan/dissectors/packet-gmr1_common.c +++ b/epan/dissectors/packet-gmr1_common.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 "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-gmr1_dtap.c b/epan/dissectors/packet-gmr1_dtap.c index baa79a34f3..bd34b2c00a 100644 --- a/epan/dissectors/packet-gmr1_dtap.c +++ b/epan/dissectors/packet-gmr1_dtap.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c index d54e7b7a25..2c1aa4f8fc 100644 --- a/epan/dissectors/packet-gmr1_rach.c +++ b/epan/dissectors/packet-gmr1_rach.c @@ -31,9 +31,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/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c index d311113e1a..ec2ca4e357 100644 --- a/epan/dissectors/packet-gmr1_rr.c +++ b/epan/dissectors/packet-gmr1_rr.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 "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index 59419ad8a8..fe20aa21ff 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.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> diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c index a17b65499e..3938ca9078 100644 --- a/epan/dissectors/packet-gnm.c +++ b/epan/dissectors/packet-gnm.c @@ -35,9 +35,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/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index b79a5836a7..d9ff2e547b 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.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/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index e15d125e55..962ca92c9c 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -31,9 +31,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/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c index f3ae8d575d..fbc0700bab 100644 --- a/epan/dissectors/packet-gopher.c +++ b/epan/dissectors/packet-gopher.c @@ -30,9 +30,7 @@ * http://en.wikipedia.org/wiki/Gopher_%28protocol%29 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-gpef.c b/epan/dissectors/packet-gpef.c index 0f28bf6579..9a1f152c41 100644 --- a/epan/dissectors/packet-gpef.c +++ b/epan/dissectors/packet-gpef.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/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c index 1f39457116..c3162897fc 100644 --- a/epan/dissectors/packet-gprs-llc.c +++ b/epan/dissectors/packet-gprs-llc.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/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c index de0188184a..4160cc7056 100644 --- a/epan/dissectors/packet-gprscdr.c +++ b/epan/dissectors/packet-gprscdr.c @@ -31,9 +31,7 @@ * References: 3GPP TS 32.298 */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index ee481f7ebf..7c5d074936 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.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/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index ce1f4a1bad..479570e12a 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -38,9 +38,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/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index 7ca8b95554..e1a5aaaece 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.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 <math.h> diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index ac1d74cfbd..c2d458faf3 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -93,9 +93,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/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index 9dd75f9f06..bb4ad421a1 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -62,9 +62,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/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c index 8e46771f65..1ec4b1fd95 100644 --- a/epan/dissectors/packet-gsm_a_rp.c +++ b/epan/dissectors/packet-gsm_a_rp.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 "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index e10e2989c3..f6e9251dcf 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -44,9 +44,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/prefs.h> diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c index 75da24317c..0c9058b985 100644 --- a/epan/dissectors/packet-gsm_abis_om2000.c +++ b/epan/dissectors/packet-gsm_abis_om2000.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> diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c index ffba8a523a..2cba113abc 100644 --- a/epan/dissectors/packet-gsm_abis_oml.c +++ b/epan/dissectors/packet-gsm_abis_oml.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> diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c index e46dbdffc7..11ae0b8043 100644 --- a/epan/dissectors/packet-gsm_bsslap.c +++ b/epan/dissectors/packet-gsm_bsslap.c @@ -25,9 +25,7 @@ * References: 3GPP TS 48.071 version 7.2.0 Release 7 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c index c7ddd15f67..4d2a3f7aa4 100644 --- a/epan/dissectors/packet-gsm_bssmap_le.c +++ b/epan/dissectors/packet-gsm_bssmap_le.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> diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c index b91adcba2e..6ccbfe07ef 100644 --- a/epan/dissectors/packet-gsm_cbch.c +++ b/epan/dissectors/packet-gsm_cbch.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/packet.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c index feb3a5d412..6f4c1b34eb 100644 --- a/epan/dissectors/packet-gsm_ipa.c +++ b/epan/dissectors/packet-gsm_ipa.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> diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 78874bf593..e48813e20e 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -52,9 +52,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/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index 636256f64c..096472107c 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -48,9 +48,7 @@ * see packet-gsmtap.c for an example of the use of this dissector. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c index 23926e09ff..6980bd6e0d 100644 --- a/epan/dissectors/packet-gsm_sim.c +++ b/epan/dissectors/packet-gsm_sim.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> diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index f9ee8ea7e7..9b9ac4fb10 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.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 "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c index 410b6bdebb..92a2ac6797 100644 --- a/epan/dissectors/packet-gsm_sms_ud.c +++ b/epan/dissectors/packet-gsm_sms_ud.c @@ -56,9 +56,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/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c index 89264e3488..55792ba704 100644 --- a/epan/dissectors/packet-gsm_um.c +++ b/epan/dissectors/packet-gsm_um.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/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c index 9a5d3d68b9..e28875ba7a 100644 --- a/epan/dissectors/packet-gsmtap.c +++ b/epan/dissectors/packet-gsmtap.c @@ -42,9 +42,7 @@ * It uses the wimax plugin to decode the WiMAX bursts. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index f7fb88300a..eb14cdd968 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.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/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 7c0d57164c..f3b3a7691b 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -43,9 +43,7 @@ * GTP' 3GPP TS 32.295 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/conversation.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 2e23df9a38..fdf56be3bc 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -25,9 +25,7 @@ * Ref: 3GPP TS 29.274 version 11.1.0 Release 11 ETSI TS 129 274 V8.1.1 (2009-04) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 181f902ddf..e831a07c79 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -45,9 +45,7 @@ * may be translated back into register names * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c index 31a5acfaaf..42e1ef88f8 100644 --- a/epan/dissectors/packet-gvrp.c +++ b/epan/dissectors/packet-gvrp.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/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c index 0c6254b219..e5e85619db 100644 --- a/epan/dissectors/packet-h1.c +++ b/epan/dissectors/packet-h1.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/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c index 632471978c..ef0993aa54 100644 --- a/epan/dissectors/packet-h221_nonstd.c +++ b/epan/dissectors/packet-h221_nonstd.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/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index f65c959f96..a814a94817 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.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/emem.h> diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index f5a5e5d849..f805a3ca34 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -40,9 +40,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index 83d4242040..b76366af48 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -31,9 +31,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/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 4c523a3c40..ea090a6c83 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -40,9 +40,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 2872311bb3..7358ac7de6 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -33,9 +33,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/epan/dissectors/packet-h248_10.c b/epan/dissectors/packet-h248_10.c index d5518c8b48..37d2722c96 100644 --- a/epan/dissectors/packet-h248_10.c +++ b/epan/dissectors/packet-h248_10.c @@ -29,9 +29,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "packet-h248.h" #define PNAME "H.248.10" diff --git a/epan/dissectors/packet-h248_2.c b/epan/dissectors/packet-h248_2.c index 9856c26b94..167c75d20f 100644 --- a/epan/dissectors/packet-h248_2.c +++ b/epan/dissectors/packet-h248_2.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "packet-h248.h" #define PNAME "H.248.2" diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c index d6f1aa5dfb..774a987816 100644 --- a/epan/dissectors/packet-h248_3gpp.c +++ b/epan/dissectors/packet-h248_3gpp.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" #define PNAME "H.248 3GPP" diff --git a/epan/dissectors/packet-h248_7.c b/epan/dissectors/packet-h248_7.c index 9f031df3a7..b3ab9d4598 100644 --- a/epan/dissectors/packet-h248_7.c +++ b/epan/dissectors/packet-h248_7.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 "packet-h248.h" diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index 3d7e3ddd57..addc0c1109 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.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" #define PNAME "H.248 Annex C" diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c index 09c2e78f2b..8554109325 100644 --- a/epan/dissectors/packet-h248_annex_e.c +++ b/epan/dissectors/packet-h248_annex_e.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" /*****/ diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c index d23b4bc54d..f01abcbece 100644 --- a/epan/dissectors/packet-h248_q1950.c +++ b/epan/dissectors/packet-h248_q1950.c @@ -27,9 +27,7 @@ * Ref ITU-T Rec. Q.1950 (12/2002) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "packet-h248.h" #include "packet-isup.h" diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c index 907aa5b411..397b36b4d6 100644 --- a/epan/dissectors/packet-h261.c +++ b/epan/dissectors/packet-h261.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/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c index 61b542dfe4..ff98dfca93 100644 --- a/epan/dissectors/packet-h263.c +++ b/epan/dissectors/packet-h263.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/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index c3583b129f..8d501c8799 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index 3846274b43..ee7735bad4 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -27,9 +27,7 @@ * http://www.itu.int/rec/T-REC-H.264/en */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c index 64c3526d6e..e52c495580 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -31,9 +31,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/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c index cbd2fa50d7..323dcdae6d 100644 --- a/epan/dissectors/packet-h283.c +++ b/epan/dissectors/packet-h283.c @@ -31,9 +31,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/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c index 37bc0047ef..bb0430497b 100644 --- a/epan/dissectors/packet-h323.c +++ b/epan/dissectors/packet-h323.c @@ -31,9 +31,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/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c index d44e95ffe5..abf0dfc82f 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -31,9 +31,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/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 4cb8f7426a..8aa62a30c9 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -36,9 +36,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index d7c93d9dc8..7be4d33431 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -31,9 +31,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/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c index 43e9d94f74..30c90676b5 100644 --- a/epan/dissectors/packet-h501.c +++ b/epan/dissectors/packet-h501.c @@ -31,9 +31,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/epan/dissectors/packet-hartip.c b/epan/dissectors/packet-hartip.c index 069e9775ce..4863e1e969 100644 --- a/epan/dissectors/packet-hartip.c +++ b/epan/dissectors/packet-hartip.c @@ -25,9 +25,7 @@ * 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/epan/dissectors/packet-hazelcast.c b/epan/dissectors/packet-hazelcast.c index a4cfa977ae..0083789569 100644 --- a/epan/dissectors/packet-hazelcast.c +++ b/epan/dissectors/packet-hazelcast.c @@ -31,9 +31,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c index 90c7b4dcaf..84c1bbeeb7 100644 --- a/epan/dissectors/packet-hci_h1.c +++ b/epan/dissectors/packet-hci_h1.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 <epan/packet.h> diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c index 0bcdb063f3..b4702aeb2c 100644 --- a/epan/dissectors/packet-hci_h4.c +++ b/epan/dissectors/packet-hci_h4.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 <epan/packet.h> diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c index 7c2972df44..a626126926 100644 --- a/epan/dissectors/packet-hclnfsd.c +++ b/epan/dissectors/packet-hclnfsd.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 <string.h> diff --git a/epan/dissectors/packet-hdcp.c b/epan/dissectors/packet-hdcp.c index 95da1d43ee..98f142496e 100644 --- a/epan/dissectors/packet-hdcp.c +++ b/epan/dissectors/packet-hdcp.c @@ -31,9 +31,7 @@ * http://www.digital-cp.com/files/static_page_files/5C3DC13B-9F6B-D82E-D77D8ACA08A448BF/HDCP Specification Rev1_4.pdf */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-hdcp2.c b/epan/dissectors/packet-hdcp2.c index 8978ebfc09..11960cf9bb 100644 --- a/epan/dissectors/packet-hdcp2.c +++ b/epan/dissectors/packet-hdcp2.c @@ -31,9 +31,7 @@ * http://www.digital-cp.com/files/static_page_files/DABB540C-1A4B-B294-D0008CB2D348FA19/HDCP Interface Independent Adaptation Specification Rev2_1.pdf */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c index 42eb04c388..aaa31526eb 100644 --- a/epan/dissectors/packet-hdfs.c +++ b/epan/dissectors/packet-hdfs.c @@ -27,9 +27,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c index ba409b6e6a..9bb4101200 100644 --- a/epan/dissectors/packet-hdfsdata.c +++ b/epan/dissectors/packet-hdfsdata.c @@ -27,9 +27,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index 33d95dd004..527488f221 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.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 <epan/packet.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-hnbap.c b/epan/dissectors/packet-hnbap.c index f17b6749fe..8bad6162c4 100644 --- a/epan/dissectors/packet-hnbap.c +++ b/epan/dissectors/packet-hnbap.c @@ -33,9 +33,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/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c index 415fbd4c76..d928aa317b 100644 --- a/epan/dissectors/packet-homeplug-av.c +++ b/epan/dissectors/packet-homeplug-av.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> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index 82db080a48..54003ff5db 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.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> diff --git a/epan/dissectors/packet-hp-erm.c b/epan/dissectors/packet-hp-erm.c index 9dc75e2787..10d2f0b6d3 100644 --- a/epan/dissectors/packet-hp-erm.c +++ b/epan/dissectors/packet-hp-erm.c @@ -45,9 +45,7 @@ * header. The only difference is the priority numbering. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c index a6edb5cb08..4aa01df984 100644 --- a/epan/dissectors/packet-hpext.c +++ b/epan/dissectors/packet-hpext.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/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c index 0943f80607..174a515728 100644 --- a/epan/dissectors/packet-hpsw.c +++ b/epan/dissectors/packet-hpsw.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/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c index 100b0d26b6..3087eef032 100644 --- a/epan/dissectors/packet-hpteam.c +++ b/epan/dissectors/packet-hpteam.c @@ -24,9 +24,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-hsr-prp-supervision.c b/epan/dissectors/packet-hsr-prp-supervision.c index 01d604c0e7..38fba01476 100644 --- a/epan/dissectors/packet-hsr-prp-supervision.c +++ b/epan/dissectors/packet-hsr-prp-supervision.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/epan/dissectors/packet-hsr.c b/epan/dissectors/packet-hsr.c index 5bacd8b689..411be5d4fd 100644 --- a/epan/dissectors/packet-hsr.c +++ b/epan/dissectors/packet-hsr.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/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index 8d0e39285c..f3f63ecf6a 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -134,9 +134,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 129ace3179..cff8ce9e89 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -30,9 +30,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/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c index 1517954274..6833435846 100644 --- a/epan/dissectors/packet-hyperscsi.c +++ b/epan/dissectors/packet-hyperscsi.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/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c index 84f369cfb4..77a71ce250 100644 --- a/epan/dissectors/packet-i2c.c +++ b/epan/dissectors/packet-i2c.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/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c index 1f92f5760d..d518c6a5d1 100644 --- a/epan/dissectors/packet-iapp.c +++ b/epan/dissectors/packet-iapp.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/oui.h> diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index c6999fa422..6bbc0c9db9 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -30,9 +30,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/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c index dd095443c8..42a18e6a64 100644 --- a/epan/dissectors/packet-icap.c +++ b/epan/dissectors/packet-icap.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 <string.h> #include <ctype.h> diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index da768302c7..c19bc50e52 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -38,9 +38,7 @@ 2) Informations about Ice can be found here: http://www.zeroc.com */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index d9b9bcd146..0b5362095d 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -32,9 +32,7 @@ * (c) 2011 Gaurav Tungatkar <gstungat@ncsu.edu> */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <time.h> diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 5a2cdae781..8e010d5194 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -33,9 +33,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/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c index 7e60daaba2..5624a4dc99 100644 --- a/epan/dissectors/packet-icp.c +++ b/epan/dissectors/packet-icp.c @@ -26,9 +26,7 @@ */ #define MAX_TEXTBUF_LENGTH 600 -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 782e3566fd..4d39bc80e8 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -29,9 +29,7 @@ * appropriate place with the code itself. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_STDDEF_H #include <stddef.h> diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c index 04520a4233..583b614e2f 100644 --- a/epan/dissectors/packet-idmp.c +++ b/epan/dissectors/packet-idmp.c @@ -31,9 +31,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/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c index f357161436..2455a96cce 100644 --- a/epan/dissectors/packet-idp.c +++ b/epan/dissectors/packet-idp.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/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index daab5b6fb5..16442cc10d 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -30,9 +30,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 <glib.h> diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index 8251b682ad..4b142953ae 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -31,9 +31,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c index 86a1f2a1b2..ea03a35916 100644 --- a/epan/dissectors/packet-ieee17221.c +++ b/epan/dissectors/packet-ieee17221.c @@ -32,9 +32,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* #include <stdio.h> */ diff --git a/epan/dissectors/packet-ieee80211-airopeek.c b/epan/dissectors/packet-ieee80211-airopeek.c index 7ba6b49900..17e03eb0e5 100644 --- a/epan/dissectors/packet-ieee80211-airopeek.c +++ b/epan/dissectors/packet-ieee80211-airopeek.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 <epan/packet.h> #include "packet-ieee80211.h" diff --git a/epan/dissectors/packet-ieee80211-netmon.c b/epan/dissectors/packet-ieee80211-netmon.c index ace88ec856..19d5c544fc 100644 --- a/epan/dissectors/packet-ieee80211-netmon.c +++ b/epan/dissectors/packet-ieee80211-netmon.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/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index ba137c8109..1d847e3fe9 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.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> #include "packet-ieee80211.h" diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c index 4e7f03baa4..0d48cef327 100644 --- a/epan/dissectors/packet-ieee80211-radio.c +++ b/epan/dissectors/packet-ieee80211-radio.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> #include "packet-ieee80211.h" diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c index fdc7b604ad..ef8f053dc0 100644 --- a/epan/dissectors/packet-ieee80211-radiotap.c +++ b/epan/dissectors/packet-ieee80211-radiotap.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 <glib.h> #include <errno.h> diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c index de71184f0e..c641fc246b 100644 --- a/epan/dissectors/packet-ieee80211-wlancap.c +++ b/epan/dissectors/packet-ieee80211-wlancap.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> #include "packet-ieee80211.h" diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 40ac4cc216..32009f7890 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -91,9 +91,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <math.h> diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 827f04117f..5f4f7ddbf9 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -59,9 +59,7 @@ */ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVEHCONFIG_H */ #include <string.h> diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c index 1ec4fdd1a1..562cdaf8d4 100644 --- a/epan/dissectors/packet-ieee8021ah.c +++ b/epan/dissectors/packet-ieee8021ah.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/epan/dissectors/packet-ieee8023.c b/epan/dissectors/packet-ieee8023.c index 3a5ab67166..bd9b473ae7 100644 --- a/epan/dissectors/packet-ieee8023.c +++ b/epan/dissectors/packet-ieee8023.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/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c index c912e65b3f..ae951cd149 100644 --- a/epan/dissectors/packet-ieee802a.c +++ b/epan/dissectors/packet-ieee802a.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/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c index ad2f0f0a53..da1dda0d13 100644 --- a/epan/dissectors/packet-ifcp.c +++ b/epan/dissectors/packet-ifcp.c @@ -30,9 +30,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/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index 80f573092d..321e9f20cf 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -42,9 +42,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 5450d55e86..c411fa5c29 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -108,9 +108,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c index df391dbe07..87396ddca4 100644 --- a/epan/dissectors/packet-igrp.c +++ b/epan/dissectors/packet-igrp.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 <glib.h> diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c index dbffbf3e48..23e7de8ea8 100644 --- a/epan/dissectors/packet-image-gif.c +++ b/epan/dissectors/packet-image-gif.c @@ -35,9 +35,7 @@ /* Edit this file with 4-space indentation */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c index fc80afface..582fefd79b 100644 --- a/epan/dissectors/packet-image-jfif.c +++ b/epan/dissectors/packet-image-jfif.c @@ -36,9 +36,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/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c index 9626ab01fd..d9978d389c 100644 --- a/epan/dissectors/packet-image-png.c +++ b/epan/dissectors/packet-image-png.c @@ -27,9 +27,7 @@ /* See http://www.w3.org/TR/PNG for specification */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c index cbfab10e8d..8480f9dc87 100644 --- a/epan/dissectors/packet-imap.c +++ b/epan/dissectors/packet-imap.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> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index ddf36d734a..20f950a151 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.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 <ctype.h> diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 949c503cdf..dd24b4d69c 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -33,9 +33,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/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 61a8c7f77f..017dac8da1 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.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/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c index 75d9a8ae26..8615cd3afc 100644 --- a/epan/dissectors/packet-infiniband_sdp.c +++ b/epan/dissectors/packet-infiniband_sdp.c @@ -24,9 +24,7 @@ * 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/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c index 6e3471c4cf..626e9cbc0a 100644 --- a/epan/dissectors/packet-interlink.c +++ b/epan/dissectors/packet-interlink.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/packet.h> diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 753a8245d6..fef886f827 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.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> #include <glib.h> diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c index c318fb29db..a1e914b164 100644 --- a/epan/dissectors/packet-ipars.c +++ b/epan/dissectors/packet-ipars.c @@ -27,9 +27,7 @@ * written so that there are filterable fields available for IPARS too. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index a257384306..9b23b12ccb 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -38,9 +38,7 @@ * http://tools.ietf.org/html/draft-pickett-ipdc-management-00 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <math.h> diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c index 1ec91d302d..c60f89212e 100644 --- a/epan/dissectors/packet-ipfc.c +++ b/epan/dissectors/packet-ipfc.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> diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c index fcf39b12e7..5cc440df99 100644 --- a/epan/dissectors/packet-ipmi-app.c +++ b/epan/dissectors/packet-ipmi-app.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/epan/dissectors/packet-ipmi-bridge.c b/epan/dissectors/packet-ipmi-bridge.c index 0160297a64..3408ef59e5 100644 --- a/epan/dissectors/packet-ipmi-bridge.c +++ b/epan/dissectors/packet-ipmi-bridge.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/epan/dissectors/packet-ipmi-chassis.c b/epan/dissectors/packet-ipmi-chassis.c index e54b1bb6a2..b1d448e4c8 100644 --- a/epan/dissectors/packet-ipmi-chassis.c +++ b/epan/dissectors/packet-ipmi-chassis.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/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c index eb0a9771c2..5029f2db9f 100644 --- a/epan/dissectors/packet-ipmi-picmg.c +++ b/epan/dissectors/packet-ipmi-picmg.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/epan/dissectors/packet-ipmi-pps.c b/epan/dissectors/packet-ipmi-pps.c index c87fe28258..23853f25d7 100644 --- a/epan/dissectors/packet-ipmi-pps.c +++ b/epan/dissectors/packet-ipmi-pps.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/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index 96aa4fb8d7..5dde254597 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.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/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c index d8adcdba39..f471be97a2 100644 --- a/epan/dissectors/packet-ipmi-session.c +++ b/epan/dissectors/packet-ipmi-session.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/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c index ed4db023f0..4a9f53ede3 100644 --- a/epan/dissectors/packet-ipmi-storage.c +++ b/epan/dissectors/packet-ipmi-storage.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/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c index d97203651b..2be82f2fe1 100644 --- a/epan/dissectors/packet-ipmi-transport.c +++ b/epan/dissectors/packet-ipmi-transport.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/epan/dissectors/packet-ipmi-update.c b/epan/dissectors/packet-ipmi-update.c index 35a263a259..f9ef35af17 100644 --- a/epan/dissectors/packet-ipmi-update.c +++ b/epan/dissectors/packet-ipmi-update.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/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 8cb62f8a53..7cd9c0d2af 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.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 <time.h> diff --git a/epan/dissectors/packet-ipnet.c b/epan/dissectors/packet-ipnet.c index 35ab3957ae..1a8daebcda 100644 --- a/epan/dissectors/packet-ipnet.c +++ b/epan/dissectors/packet-ipnet.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/aftypes.h> diff --git a/epan/dissectors/packet-ipoib.c b/epan/dissectors/packet-ipoib.c index 9b6b19ad8e..cd156d2189 100644 --- a/epan/dissectors/packet-ipoib.c +++ b/epan/dissectors/packet-ipoib.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/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 39928d11d7..d83cbefcde 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.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 <string.h> diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c index fb9ab2436a..d3e9ecc6c7 100644 --- a/epan/dissectors/packet-ipsec-tcp.c +++ b/epan/dissectors/packet-ipsec-tcp.c @@ -31,9 +31,7 @@ * - Currently doesn't handle AH (lack of sample trace) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ipsec-udp.c b/epan/dissectors/packet-ipsec-udp.c index 3047f59069..6ec8b1b525 100644 --- a/epan/dissectors/packet-ipsec-udp.c +++ b/epan/dissectors/packet-ipsec-udp.c @@ -23,9 +23,7 @@ * * $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index a897a8938c..dd78feb4f3 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -69,9 +69,7 @@ ADD: Additional generic (non-checked) ICV length of 128, 192 and 256. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <string.h> diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c index f99ef34067..ef3680679b 100644 --- a/epan/dissectors/packet-ipsi-ctl.c +++ b/epan/dissectors/packet-ipsi-ctl.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/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index b213267340..4f58450161 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.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 <math.h> #include <glib.h> diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index 080355352a..dba50786c1 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.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/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index 79def62f3f..5125ccd67f 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index 2c42ede152..481fe003fe 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.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/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c index dabfab912b..4e0576261a 100644 --- a/epan/dissectors/packet-irc.c +++ b/epan/dissectors/packet-irc.c @@ -40,9 +40,7 @@ * http://www.invlogic.com/irc/ctcp.html */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <ctype.h> diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 3a391841e4..5c4455cc41 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -43,9 +43,7 @@ * http://www.iana.org/assignments/ikev2-parameters (last updated 2011-12-19) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index f00234a42c..6dfa4d4287 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.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 "config.h" #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index 3ac82f1370..3c0e7875d9 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.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/epan/dissectors/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c index 4d55767b4f..40d8b4aa0e 100644 --- a/epan/dissectors/packet-isis-clv.c +++ b/epan/dissectors/packet-isis-clv.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/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index 8a5cb644cc..87071f4907 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.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/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index fd37383ebe..4c5a3e30fa 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -29,9 +29,7 @@ * - Decoding for Group Address TLV and associated subTLVs as per RFC 6326 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-isis-snp.c b/epan/dissectors/packet-isis-snp.c index e744609752..08c0edeef7 100644 --- a/epan/dissectors/packet-isis-snp.c +++ b/epan/dissectors/packet-isis-snp.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/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c index 534aaeb9cc..a13c428067 100644 --- a/epan/dissectors/packet-isis.c +++ b/epan/dissectors/packet-isis.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/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index c32ee65fda..dcd8c63e99 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.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/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index 0aba99f994..8599c73bd8 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -30,9 +30,7 @@ * rather than having manual insertion via preferences * TODO: perhaps better check coherence of certain information? */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 0e4674fba0..2e169767f2 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.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> diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 4b4f675a68..78339eda68 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.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 <glib.h> diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c index d05ff7bee6..d02fb37aeb 100644 --- a/epan/dissectors/packet-iso7816.c +++ b/epan/dissectors/packet-iso7816.c @@ -29,9 +29,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 9b524b6755..0d9555cb8a 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -43,9 +43,7 @@ * Russian national ISUP-R 2000: RD 45.217-2001 book 4 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/stats_tree.h> diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c index 79b58d4b91..eb84e4ec06 100644 --- a/epan/dissectors/packet-itdm.c +++ b/epan/dissectors/packet-itdm.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/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c index 638d415b83..6dad04f475 100644 --- a/epan/dissectors/packet-iua.c +++ b/epan/dissectors/packet-iua.c @@ -31,9 +31,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/prefs.h> diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c index 8e37cb6c9a..f58e6d5975 100644 --- a/epan/dissectors/packet-iuup.c +++ b/epan/dissectors/packet-iuup.c @@ -31,9 +31,7 @@ Added crc6 and crc10 checks for header and payload */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index 79dfff15fc..ef16ee6328 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -28,9 +28,7 @@ */ /* INCLUDES */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 5bcb71caf3..66cfd6bba2 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -27,9 +27,7 @@ */ /* INCLUDES */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> #include <epan/emem.h> diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index ad2fa1b084..c2358928ef 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.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/epan/dissectors/packet-jmirror.c b/epan/dissectors/packet-jmirror.c index ea476b102a..81c4a036a6 100644 --- a/epan/dissectors/packet-jmirror.c +++ b/epan/dissectors/packet-jmirror.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> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c index 5dc6e9519b..9d48919d86 100644 --- a/epan/dissectors/packet-jpeg.c +++ b/epan/dissectors/packet-jpeg.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/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index df51f9655e..251d9b7dfa 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.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 <glib.h> diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index 8c94f36461..03c8b7d139 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.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/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 41b1408ea8..027f356301 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -31,9 +31,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #define G_LOG_DOMAIN "jxta" diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index 52037eaaab..2d5f3511e7 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -23,9 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <errno.h> #include <glib.h> diff --git a/epan/dissectors/packet-kadm5.c b/epan/dissectors/packet-kadm5.c index 80ba513cff..bddc273360 100644 --- a/epan/dissectors/packet-kadm5.c +++ b/epan/dissectors/packet-kadm5.c @@ -28,9 +28,7 @@ * information for this dissector came from the MIT kadmin source. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "packet-rpc.h" diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c index ca4725858a..d6a83786be 100644 --- a/epan/dissectors/packet-kdp.c +++ b/epan/dissectors/packet-kdp.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> #include <glib.h> diff --git a/epan/dissectors/packet-kdsp.c b/epan/dissectors/packet-kdsp.c index 3ce28433fd..5dcbd7880b 100644 --- a/epan/dissectors/packet-kdsp.c +++ b/epan/dissectors/packet-kdsp.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/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 7b1896a227..f3255879ea 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -59,9 +59,7 @@ * information. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index 11ac444f63..036bb0e6f4 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -33,9 +33,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c index 9be718a7d6..cba2c79010 100644 --- a/epan/dissectors/packet-kingfisher.c +++ b/epan/dissectors/packet-kingfisher.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 <epan/packet.h> #include <epan/emem.h> diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 7275121bbc..7ab0e09eae 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.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/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c index 9c520453f4..24d504fa03 100644 --- a/epan/dissectors/packet-kismet.c +++ b/epan/dissectors/packet-kismet.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 <stdlib.h> #include <string.h> diff --git a/epan/dissectors/packet-klm.c b/epan/dissectors/packet-klm.c index 5f8de9563d..e0a7f93d22 100644 --- a/epan/dissectors/packet-klm.c +++ b/epan/dissectors/packet-klm.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 diff --git a/epan/dissectors/packet-knet.c b/epan/dissectors/packet-knet.c index 52e5c2523c..1eeaf947a5 100644 --- a/epan/dissectors/packet-knet.c +++ b/epan/dissectors/packet-knet.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> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index 4a04b96c7f..a5d3ffa2b8 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.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> #include <epan/asn1.h> diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c index 96fbbf37b2..cb03819b87 100644 --- a/epan/dissectors/packet-l1-events.c +++ b/epan/dissectors/packet-l1-events.c @@ -29,9 +29,7 @@ /* Edit this file with 4-space tabs */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 704e8e6aae..48b82c9990 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -54,9 +54,7 @@ * XXX - what about LAPD? */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c index 4136357117..f72c4876cc 100644 --- a/epan/dissectors/packet-lanforge.c +++ b/epan/dissectors/packet-lanforge.c @@ -31,9 +31,7 @@ * See http://www.candelatech.com for more info. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c index 5aeb57683d..05a7490176 100644 --- a/epan/dissectors/packet-lapb.c +++ b/epan/dissectors/packet-lapb.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/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c index a99359c0ad..92aa8ccefd 100644 --- a/epan/dissectors/packet-lapbether.c +++ b/epan/dissectors/packet-lapbether.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/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index bbec7a9959..d604f1ed99 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -37,9 +37,7 @@ * http://www.3gpp.org/ftp/Specs/html-info/48056.htm */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <string.h> diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c index 841281fb19..b8932bdb1e 100644 --- a/epan/dissectors/packet-lapdm.c +++ b/epan/dissectors/packet-lapdm.c @@ -51,9 +51,7 @@ * Bbis and C should be supported elsewhere */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index 92f5712f15..86e36ea3c4 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.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/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c index 693b3dd86b..f2b4c4a467 100644 --- a/epan/dissectors/packet-lapsat.c +++ b/epan/dissectors/packet-lapsat.c @@ -33,9 +33,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/epan/dissectors/packet-lcsap.c b/epan/dissectors/packet-lcsap.c index a245d11701..53e86d291d 100644 --- a/epan/dissectors/packet-lcsap.c +++ b/epan/dissectors/packet-lcsap.c @@ -34,9 +34,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/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 0085215367..531967eb93 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -90,9 +90,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/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 16ce253c38..e326c8ebe8 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -33,9 +33,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/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index d03dbdbdfb..23ddadc7eb 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -36,9 +36,7 @@ * UDP and TCP portions of the protocol are handled in this dissector. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <string.h> diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c index d068698789..3e447169d6 100644 --- a/epan/dissectors/packet-lge_monitor.c +++ b/epan/dissectors/packet-lge_monitor.c @@ -25,9 +25,7 @@ * LGE Monitor is a trace tool from Nortel. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index ef4998bc33..89ab2f5d04 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -42,9 +42,7 @@ * Dejan Bucar, linx@enea.com, June 21, 2011 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-lisp-data.c b/epan/dissectors/packet-lisp-data.c index 5a03712077..39b3c89ca9 100644 --- a/epan/dissectors/packet-lisp-data.c +++ b/epan/dissectors/packet-lisp-data.c @@ -24,9 +24,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index 183d89bef2..9dbfe346b2 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -24,9 +24,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> #include <epan/afn.h> diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index aa7c307bd5..ee41c88684 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.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/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 2184d5934e..68600cc137 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c index 1a1a0f1302..55ca11e3d6 100644 --- a/epan/dissectors/packet-llrp.c +++ b/epan/dissectors/packet-llrp.c @@ -26,9 +26,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c index 14ca7e95e8..2ec3c09c1c 100644 --- a/epan/dissectors/packet-llt.c +++ b/epan/dissectors/packet-llt.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/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c index a3fefb892c..304ea4d6de 100644 --- a/epan/dissectors/packet-lmi.c +++ b/epan/dissectors/packet-lmi.c @@ -34,9 +34,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index d488edcf1e..e73cbb9639 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -40,9 +40,7 @@ * August 2007 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index 18efb8419a..27d3209be2 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -31,9 +31,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/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c index 41a1d6cb1d..d0e766d938 100644 --- a/epan/dissectors/packet-lon.c +++ b/epan/dissectors/packet-lon.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> diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c index df98ddd002..6fa0d04315 100644 --- a/epan/dissectors/packet-loop.c +++ b/epan/dissectors/packet-loop.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/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c index ef9b5c8922..d726f9d2b1 100644 --- a/epan/dissectors/packet-lpd.c +++ b/epan/dissectors/packet-lpd.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/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index 82661dfd84..eba1030afa 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -34,9 +34,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/epan/dissectors/packet-lppa.c b/epan/dissectors/packet-lppa.c index 2d5ba6162a..7c859e837e 100644 --- a/epan/dissectors/packet-lppa.c +++ b/epan/dissectors/packet-lppa.c @@ -34,9 +34,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/epan/dissectors/packet-lppe.c b/epan/dissectors/packet-lppe.c index e526991ca9..00fe0d4032 100644 --- a/epan/dissectors/packet-lppe.c +++ b/epan/dissectors/packet-lppe.c @@ -33,9 +33,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/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c index 25d173cce7..485edf72f5 100644 --- a/epan/dissectors/packet-lsc.c +++ b/epan/dissectors/packet-lsc.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/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index af1680564a..8547b0ad80 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -34,9 +34,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c index 95a7e86f2d..f19795db82 100644 --- a/epan/dissectors/packet-ltp.c +++ b/epan/dissectors/packet-ltp.c @@ -27,9 +27,7 @@ * Licklider Transmission Protocol - RFC 5326. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index 7e2ddec96a..f891945932 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.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 <epan/filesystem.h> diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index f95efdda56..a9c2d00ba9 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.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 <string.h> diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c index 617e2d235a..6a0635af6f 100644 --- a/epan/dissectors/packet-m2pa.c +++ b/epan/dissectors/packet-m2pa.c @@ -32,9 +32,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c index 3b36ea7f15..767912300d 100644 --- a/epan/dissectors/packet-m2tp.c +++ b/epan/dissectors/packet-m2tp.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 <glib.h> diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c index 63a38bfd34..731c5f01b0 100644 --- a/epan/dissectors/packet-m2ua.c +++ b/epan/dissectors/packet-m2ua.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 <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-m3ap.c b/epan/dissectors/packet-m3ap.c index 1016b511df..e0bd22f3fa 100644 --- a/epan/dissectors/packet-m3ap.c +++ b/epan/dissectors/packet-m3ap.c @@ -32,9 +32,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/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index b8f4c47e5f..851e47cb64 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.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 "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-maap.c b/epan/dissectors/packet-maap.c index 0f4465de6d..8c61cd38e9 100644 --- a/epan/dissectors/packet-maap.c +++ b/epan/dissectors/packet-maap.c @@ -25,9 +25,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-mac-lte-framed.c b/epan/dissectors/packet-mac-lte-framed.c index 180fa4dc58..e1f61c3bab 100644 --- a/epan/dissectors/packet-mac-lte-framed.c +++ b/epan/dissectors/packet-mac-lte-framed.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/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 0424695a87..cb791c299a 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.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 "config.h" #include <string.h> diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index dbf404fc80..868566297f 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -27,9 +27,7 @@ * See: http://www.ieee802.org/1/files/public/docs2007/new-cm-barrass-pause-proposal.pdf */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-mactelnet.c b/epan/dissectors/packet-mactelnet.c index 40b298ca3b..b0613f1dc1 100644 --- a/epan/dissectors/packet-mactelnet.c +++ b/epan/dissectors/packet-mactelnet.c @@ -28,9 +28,7 @@ * http://www.omniflux.com/devel/mikrotik/Mikrotik_MAC_Telnet_Procotol.txt */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-manolito.c b/epan/dissectors/packet-manolito.c index 5a91e6f4b9..c1d642039f 100644 --- a/epan/dissectors/packet-manolito.c +++ b/epan/dissectors/packet-manolito.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> diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index b87241ffd8..a78f1a6c71 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.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 <epan/packet.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index 006f9b0382..f0ad336c76 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.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/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c index b84bda8161..dd118a3578 100644 --- a/epan/dissectors/packet-media.c +++ b/epan/dissectors/packet-media.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/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index af3aa568a5..92d7af7d41 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -40,9 +40,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <ctype.h> diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c index 206b64776e..e8c7d88299 100644 --- a/epan/dissectors/packet-memcache.c +++ b/epan/dissectors/packet-memcache.c @@ -30,9 +30,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/epan/dissectors/packet-mesh.c b/epan/dissectors/packet-mesh.c index 6babb27fe1..d41aea4796 100644 --- a/epan/dissectors/packet-mesh.c +++ b/epan/dissectors/packet-mesh.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> diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c index 38bc7c2a90..8158220e81 100644 --- a/epan/dissectors/packet-meta.c +++ b/epan/dissectors/packet-meta.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 <string.h> diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index b6eee032bb..bf510aaaaa 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -33,9 +33,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 <ctype.h> diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index e261270681..7586cde5dc 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -35,9 +35,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-mim.c b/epan/dissectors/packet-mim.c index 66c9fb897c..2f257e5ed4 100644 --- a/epan/dissectors/packet-mim.c +++ b/epan/dissectors/packet-mim.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-mime-encap.c b/epan/dissectors/packet-mime-encap.c index 49fcff0400..071c4ce160 100644 --- a/epan/dissectors/packet-mime-encap.c +++ b/epan/dissectors/packet-mime-encap.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c index 3311d4d278..260290b303 100644 --- a/epan/dissectors/packet-miop.c +++ b/epan/dissectors/packet-miop.c @@ -30,9 +30,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index efaa954a8e..a8a8464be8 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.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> diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 209748a5c1..86774308b5 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -30,9 +30,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/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 2be4b320fc..9f660945d8 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -31,9 +31,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/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index a7f562511b..6fedc966b6 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -33,9 +33,7 @@ /* This file has been edited with 8-space tabs and 4-space indentation */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-mndp.c b/epan/dissectors/packet-mndp.c index 65418e8d3a..767caeb49b 100644 --- a/epan/dissectors/packet-mndp.c +++ b/epan/dissectors/packet-mndp.c @@ -32,9 +32,7 @@ - Find out about unpack values */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-mojito.c b/epan/dissectors/packet-mojito.c index 6fc104479d..e4034e431c 100644 --- a/epan/dissectors/packet-mojito.c +++ b/epan/dissectors/packet-mojito.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> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-moldudp.c b/epan/dissectors/packet-moldudp.c index eec2947275..2c1801bdb6 100644 --- a/epan/dissectors/packet-moldudp.c +++ b/epan/dissectors/packet-moldudp.c @@ -25,9 +25,7 @@ * 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/epan/dissectors/packet-moldudp64.c b/epan/dissectors/packet-moldudp64.c index 1a7f9d588b..bf294198a8 100644 --- a/epan/dissectors/packet-moldudp64.c +++ b/epan/dissectors/packet-moldudp64.c @@ -25,9 +25,7 @@ * 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/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c index a17813d009..b5cd1106b3 100644 --- a/epan/dissectors/packet-mongo.c +++ b/epan/dissectors/packet-mongo.c @@ -31,9 +31,7 @@ * http://bsonspec.org/#/specification */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c index 9e27f3fb72..396abcd522 100644 --- a/epan/dissectors/packet-mount.c +++ b/epan/dissectors/packet-mount.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 <string.h> diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index c8fe8f7e8e..6dfca95297 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.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/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index 761400be39..8d6972a7d4 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -27,9 +27,7 @@ * http://www.ietf.org/rfc/rfc3016.txt?number=3016 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 96b3ac3302..62bed30017 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -30,9 +30,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/epan/dissectors/packet-mpeg-ca.c b/epan/dissectors/packet-mpeg-ca.c index a6995f4df4..25ecc0c3b8 100644 --- a/epan/dissectors/packet-mpeg-ca.c +++ b/epan/dissectors/packet-mpeg-ca.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index 88bab79fd6..fc5987f375 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-mpeg-dsmcc.c b/epan/dissectors/packet-mpeg-dsmcc.c index ef8ccdb8bc..181b780a7a 100644 --- a/epan/dissectors/packet-mpeg-dsmcc.c +++ b/epan/dissectors/packet-mpeg-dsmcc.c @@ -24,9 +24,7 @@ * 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/epan/dissectors/packet-mpeg-pat.c b/epan/dissectors/packet-mpeg-pat.c index 2a735488f6..c8f66f8ae3 100644 --- a/epan/dissectors/packet-mpeg-pat.c +++ b/epan/dissectors/packet-mpeg-pat.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index a82c723a20..cf206d15c2 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -31,9 +31,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/epan/dissectors/packet-mpeg-pmt.c b/epan/dissectors/packet-mpeg-pmt.c index 76686ae799..011f8977e7 100644 --- a/epan/dissectors/packet-mpeg-pmt.c +++ b/epan/dissectors/packet-mpeg-pmt.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-mpeg-sect.c b/epan/dissectors/packet-mpeg-sect.c index 8222034f4b..2788ea4886 100644 --- a/epan/dissectors/packet-mpeg-sect.c +++ b/epan/dissectors/packet-mpeg-sect.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c index a563e11aa4..f464aa2ecd 100644 --- a/epan/dissectors/packet-mpeg1.c +++ b/epan/dissectors/packet-mpeg1.c @@ -31,9 +31,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 2c888cce8a..e2862d3ac4 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -30,9 +30,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/epan/dissectors/packet-mpls-pm.c b/epan/dissectors/packet-mpls-pm.c index af72f962ce..342cd6129e 100644 --- a/epan/dissectors/packet-mpls-pm.c +++ b/epan/dissectors/packet-mpls-pm.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> diff --git a/epan/dissectors/packet-mpls-psc.c b/epan/dissectors/packet-mpls-psc.c index 38a8ec5af7..031580c948 100644 --- a/epan/dissectors/packet-mpls-psc.c +++ b/epan/dissectors/packet-mpls-psc.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> diff --git a/epan/dissectors/packet-mpls-y1711.c b/epan/dissectors/packet-mpls-y1711.c index d0c18c9a21..5b9b819aba 100644 --- a/epan/dissectors/packet-mpls-y1711.c +++ b/epan/dissectors/packet-mpls-y1711.c @@ -37,9 +37,7 @@ * table indexed by label value it has been moved here. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 3203fc40cf..ac658c0c52 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -48,9 +48,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/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c index ec92dec2c7..bb70910551 100644 --- a/epan/dissectors/packet-mq-pcf.c +++ b/epan/dissectors/packet-mq-pcf.c @@ -31,9 +31,7 @@ * MQ PCF documentation is called "WebSphere MQ Programmable Command Formats and Administration Interface" */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index b9141021fb..a2f72178b4 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -66,9 +66,7 @@ * - Packets which structures built on different platforms */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c index cb883a4456..bf1fc86d9d 100644 --- a/epan/dissectors/packet-mrdisc.c +++ b/epan/dissectors/packet-mrdisc.c @@ -36,9 +36,7 @@ TTL==1 and IP.DST==224.0.0.2 for all packets. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-mrp-mmrp.c b/epan/dissectors/packet-mrp-mmrp.c index 6f5b613047..03f845577b 100644 --- a/epan/dissectors/packet-mrp-mmrp.c +++ b/epan/dissectors/packet-mrp-mmrp.c @@ -32,9 +32,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index 7eb5997ee8..1b6a04353a 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -31,9 +31,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-mrp-mvrp.c b/epan/dissectors/packet-mrp-mvrp.c index b6824b07d7..8bf901aad1 100644 --- a/epan/dissectors/packet-mrp-mvrp.c +++ b/epan/dissectors/packet-mrp-mvrp.c @@ -32,9 +32,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 79f3b79253..2dc6828ebb 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -30,9 +30,7 @@ * sdp.ppona.com */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <stdio.h> diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index bf5005e944..6791f63083 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.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> diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c index 59759b1374..6774782ff3 100644 --- a/epan/dissectors/packet-msn-messenger.c +++ b/epan/dissectors/packet-msn-messenger.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/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c index ddd4d7635e..d934c14f0b 100644 --- a/epan/dissectors/packet-msnip.c +++ b/epan/dissectors/packet-msnip.c @@ -35,9 +35,7 @@ Defined in draft-ietf-idmr-igmp-msnip-00.txt */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c index 06f5678012..aca8570094 100644 --- a/epan/dissectors/packet-msnlb.c +++ b/epan/dissectors/packet-msnlb.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/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index 7879d24dcd..79dc165b5c 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -41,9 +41,7 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 9439648e0d..9ceaceeb0d 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -26,9 +26,7 @@ * http://www.ietf.org/internet-drafts/draft-ietf-simple-message-sessions-10.txt */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> #include <ctype.h> diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index 72953d9c8e..e5bb2fd91b 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -31,9 +31,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/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c index a451a7d7f7..1a82d7d43a 100644 --- a/epan/dissectors/packet-mtp2.c +++ b/epan/dissectors/packet-mtp2.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/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index ccc9776154..09f9c76c7e 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -37,9 +37,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 <glib.h> diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c index 8db3fb9c5a..4bca3cfe73 100644 --- a/epan/dissectors/packet-mtp3mg.c +++ b/epan/dissectors/packet-mtp3mg.c @@ -37,9 +37,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/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index 91261663eb..c1cc66be3e 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -56,9 +56,7 @@ * Note that line-end is often a LF instead of a CRLF. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> #include <ctype.h> diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c index e2f046a919..7dc4e5df06 100644 --- a/epan/dissectors/packet-mux27010.c +++ b/epan/dissectors/packet-mux27010.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/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 32f8f38412..49459faae6 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -37,9 +37,7 @@ /* create extra output for conversation tracking */ /* #define CTDEBUG 1 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index bb4bbb078e..4ffe0bbf24 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -26,9 +26,7 @@ * References: 3GPP TS 24.301 V10.6.1 (2012-03) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c index 98b958ed6a..dbaf9a30c2 100644 --- a/epan/dissectors/packet-nasdaq-itch.c +++ b/epan/dissectors/packet-nasdaq-itch.c @@ -33,9 +33,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> #include <string.h> diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c index 730f6c7d8a..a8f0d90f5b 100644 --- a/epan/dissectors/packet-nasdaq-soup.c +++ b/epan/dissectors/packet-nasdaq-soup.c @@ -27,9 +27,7 @@ * http://www.nasdaqtrader.com/content/technicalsupport/specifications/dataproducts/souptcp.pdf */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c index f6c5db137a..ed435a96c7 100644 --- a/epan/dissectors/packet-nat-pmp.c +++ b/epan/dissectors/packet-nat-pmp.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 <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c index dc1e4be05e..dae0f6bd5e 100644 --- a/epan/dissectors/packet-nb_rtpmux.c +++ b/epan/dissectors/packet-nb_rtpmux.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/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 14547f3d22..7f30bc6a6c 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -33,9 +33,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/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index e93eb652aa..4872cd508d 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.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> diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c index 83f685a01f..2ab6a350f9 100644 --- a/epan/dissectors/packet-nbipx.c +++ b/epan/dissectors/packet-nbipx.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/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index 7c21a97dbd..ead357c28b 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.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 <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index b908547770..49e124d40f 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.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/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index 4329cbd81e..1a7436bc66 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.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/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index e2fca1358a..0cf0202470 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -42,9 +42,7 @@ increase each time the file is reloaded). */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c index bae9d745f1..2064c3d9c6 100644 --- a/epan/dissectors/packet-ncs.c +++ b/epan/dissectors/packet-ncs.c @@ -25,9 +25,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/ipproto.h> diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 5a6f4d06b4..865be6cb27 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -30,9 +30,7 @@ this file implements version 3 of ndmp */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c index f6f8935c99..110287f158 100644 --- a/epan/dissectors/packet-ndp.c +++ b/epan/dissectors/packet-ndp.c @@ -32,9 +32,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 01ed8d96eb..fccd7182b4 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.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/epan/dissectors/packet-negoex.c b/epan/dissectors/packet-negoex.c index 60da298fb5..31d8aa8d4f 100644 --- a/epan/dissectors/packet-negoex.c +++ b/epan/dissectors/packet-negoex.c @@ -25,9 +25,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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index a349fdc234..600fb9710c 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -56,9 +56,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index bc1e4097d2..f597e3e30d 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.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> diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c index 11dd1c6990..c2f572e6c0 100644 --- a/epan/dissectors/packet-netdump.c +++ b/epan/dissectors/packet-netdump.c @@ -24,9 +24,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 80fe54e056..9d98515a56 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -123,9 +123,7 @@ * Note for WMeier... Added YYY comments with some XXX comments. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c index a3eaef90bc..f333292624 100644 --- a/epan/dissectors/packet-netperfmeter.c +++ b/epan/dissectors/packet-netperfmeter.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 <epan/packet.h> #include <epan/sctpppids.h> diff --git a/epan/dissectors/packet-netrom.c b/epan/dissectors/packet-netrom.c index 66eff544d9..21c3a7f82b 100644 --- a/epan/dissectors/packet-netrom.c +++ b/epan/dissectors/packet-netrom.c @@ -43,9 +43,7 @@ * with the base file built from README.developers. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c index 22bf3f2fa8..951dc92e2b 100644 --- a/epan/dissectors/packet-netsync.c +++ b/epan/dissectors/packet-netsync.c @@ -26,9 +26,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c index f3f2ff0b7e..1631476568 100644 --- a/epan/dissectors/packet-nettl.c +++ b/epan/dissectors/packet-nettl.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c index f1f730b413..4688479521 100644 --- a/epan/dissectors/packet-newmail.c +++ b/epan/dissectors/packet-newmail.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/epan/dissectors/packet-nflog.c b/epan/dissectors/packet-nflog.c index b97c912aec..2dcc45de89 100644 --- a/epan/dissectors/packet-nflog.c +++ b/epan/dissectors/packet-nflog.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/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 540eca223d..30e34d3a07 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.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 <stdio.h> diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c index ed3b1e6dc1..5ca0921070 100644 --- a/epan/dissectors/packet-nfsacl.c +++ b/epan/dissectors/packet-nfsacl.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 "packet-rpc.h" #include "packet-nfs.h" diff --git a/epan/dissectors/packet-nfsauth.c b/epan/dissectors/packet-nfsauth.c index 5d5e789d1c..6846282ddd 100644 --- a/epan/dissectors/packet-nfsauth.c +++ b/epan/dissectors/packet-nfsauth.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 diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 7702c10e24..7d84d8cd0e 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -28,9 +28,7 @@ * added by Timo Teras <timo.teras@iki.fi> */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c index 26b5be55dd..ec762ede7c 100644 --- a/epan/dissectors/packet-nisplus.c +++ b/epan/dissectors/packet-nisplus.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 <time.h> diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c index 6ce52f6008..0791155aea 100644 --- a/epan/dissectors/packet-nlm.c +++ b/epan/dissectors/packet-nlm.c @@ -31,9 +31,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index 7a4d140a86..6eeb8b0a8d 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.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/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c index 58343aa50c..0deb8bb2ae 100644 --- a/epan/dissectors/packet-nntp.c +++ b/epan/dissectors/packet-nntp.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/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c index 4813b40a71..e4d73e04e5 100644 --- a/epan/dissectors/packet-noe.c +++ b/epan/dissectors/packet-noe.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/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index bd5b957fb1..46fe54333c 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -31,9 +31,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/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index f888290b29..1d5d0266a8 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -25,9 +25,7 @@ /* 3GPP TS 48.016 V 5.3.0 (2004-07) Release 6 + CR013 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c index 9c6b7412bc..9bbc66a523 100644 --- a/epan/dissectors/packet-nsrp.c +++ b/epan/dissectors/packet-nsrp.c @@ -44,9 +44,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c index e9ff347c78..cb0201b13b 100644 --- a/epan/dissectors/packet-nstrace.c +++ b/epan/dissectors/packet-nstrace.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/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c index d65dc54a47..2d2b1f0a06 100644 --- a/epan/dissectors/packet-nt-tpcp.c +++ b/epan/dissectors/packet-nt-tpcp.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 <string.h> diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 84db1157b9..c9322d0c25 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -26,9 +26,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* Just set me to activate debug #define DEBUG_NTLMSSP */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef DEBUG_NTLMSSP #include <stdio.h> #endif diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index e18858edcc..3baf053f18 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.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 <math.h> diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c index 6565d46b90..27dbff65b9 100644 --- a/epan/dissectors/packet-null.c +++ b/epan/dissectors/packet-null.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> diff --git a/epan/dissectors/packet-nwmtp.c b/epan/dissectors/packet-nwmtp.c index f5de901e8c..51d93399dd 100644 --- a/epan/dissectors/packet-nwmtp.c +++ b/epan/dissectors/packet-nwmtp.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> diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index b1929650e8..ccaf1c81ea 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -31,9 +31,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/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c index 69ffba11c0..b53f40bfa5 100644 --- a/epan/dissectors/packet-oicq.c +++ b/epan/dissectors/packet-oicq.c @@ -31,9 +31,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/epan/dissectors/packet-oipf.c b/epan/dissectors/packet-oipf.c index bed9fec193..0369bf422e 100644 --- a/epan/dissectors/packet-oipf.c +++ b/epan/dissectors/packet-oipf.c @@ -27,9 +27,7 @@ (CSPG-CI+) as defined in in Open IPTV Forum Specification Volume 7 V2.1 http://www.openiptvforum.org/release_2.html */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index 12f864df04..0fa685535d 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -30,9 +30,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/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c index c5d14b8407..64797a5ec3 100644 --- a/epan/dissectors/packet-omapi.c +++ b/epan/dissectors/packet-omapi.c @@ -45,9 +45,7 @@ * +---16b---+--v---+----------+---v---+ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/ptvcursor.h> diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c index cf94f1df73..f5850fc5e0 100644 --- a/epan/dissectors/packet-omron-fins.c +++ b/epan/dissectors/packet-omron-fins.c @@ -30,9 +30,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index eb0f0c1ff6..869b619a60 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -38,9 +38,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/epan/dissectors/packet-openwire.c b/epan/dissectors/packet-openwire.c index 501d6b8736..41cf0d295c 100644 --- a/epan/dissectors/packet-openwire.c +++ b/epan/dissectors/packet-openwire.c @@ -39,9 +39,7 @@ Note : The WIREFORMAT_INFO command is always sent in "loose" format. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c index 40d97f4541..492b1dff0c 100644 --- a/epan/dissectors/packet-opsi.c +++ b/epan/dissectors/packet-opsi.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/epan/dissectors/packet-osi-options.c b/epan/dissectors/packet-osi-options.c index 6826d06ffd..0cf718c142 100644 --- a/epan/dissectors/packet-osi-options.c +++ b/epan/dissectors/packet-osi-options.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c index a5340f678a..bbe763cff4 100644 --- a/epan/dissectors/packet-osi.c +++ b/epan/dissectors/packet-osi.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> diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index d5461098f9..2c7c15ecfc 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.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 <ctype.h> #include <glib.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 052860350c..4309ce4605 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -58,9 +58,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index 7dcff421ce..8fec93fc8d 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -31,9 +31,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/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c index 2f6e9c317c..ee071a02f9 100644 --- a/epan/dissectors/packet-p22.c +++ b/epan/dissectors/packet-p22.c @@ -31,9 +31,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/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index 208e06c34e..496618da83 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -31,9 +31,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/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c index 1883dc34d6..bb0b0a4661 100644 --- a/epan/dissectors/packet-p772.c +++ b/epan/dissectors/packet-p772.c @@ -31,9 +31,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/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index 8e3e87c437..13433ef972 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -35,9 +35,7 @@ * - SEQ/ACK analysis for Announce/Request/Reject/Release PDU */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index 93b88db455..dbc4dc7492 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -25,9 +25,7 @@ * along with this program; if not, write to the Free Software * 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/prefs.h> diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c index 848bdd8413..3b9f879be9 100644 --- a/epan/dissectors/packet-packetlogger.c +++ b/epan/dissectors/packet-packetlogger.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/packet.h> diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c index 562ded89a3..d6da392b98 100644 --- a/epan/dissectors/packet-pagp.c +++ b/epan/dissectors/packet-pagp.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 <epan/packet.h> diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c index 65b0f113fa..8a88f197aa 100644 --- a/epan/dissectors/packet-paltalk.c +++ b/epan/dissectors/packet-paltalk.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 <string.h> diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index 5d46865eba..4525b27d17 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -28,9 +28,7 @@ * internet area/pana. I believe draft-18 then became RFC 5191). */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-parlay.c b/epan/dissectors/packet-parlay.c index a5526748df..fa35d2068d 100644 --- a/epan/dissectors/packet-parlay.c +++ b/epan/dissectors/packet-parlay.c @@ -35,9 +35,7 @@ static int hf_operationrequest = -1;/* Request_Operation field */ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gmodule.h> diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 5efeb3136d..f0d9ccb90c 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -36,9 +36,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/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index 3b3c3e4ff7..cc66129645 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -31,9 +31,7 @@ * (c) Copyright 2012 Svetoslav Duhovnikov <duhovnikov[AT]gmail.com> */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> #include <epan/dissectors/packet-tcp.h> diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c index 32e144e6ee..ea6542b357 100644 --- a/epan/dissectors/packet-pcli.c +++ b/epan/dissectors/packet-pcli.c @@ -29,9 +29,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c index 18807b0193..1fb73533b4 100644 --- a/epan/dissectors/packet-pcnfsd.c +++ b/epan/dissectors/packet-pcnfsd.c @@ -31,9 +31,7 @@ Protocol information comes from the book */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c index f1625d310d..ac7421caa3 100644 --- a/epan/dissectors/packet-pcp.c +++ b/epan/dissectors/packet-pcp.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 <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 18610b1f90..71234fd7f4 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.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 <string.h> diff --git a/epan/dissectors/packet-peekremote.c b/epan/dissectors/packet-peekremote.c index ef91871455..831894beb7 100644 --- a/epan/dissectors/packet-peekremote.c +++ b/epan/dissectors/packet-peekremote.c @@ -49,9 +49,7 @@ * and so on" */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index dc631769a5..f248b325b7 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -28,9 +28,7 @@ proper helper routines * 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 <math.h> diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c index bc16fcf765..ec77b5a5d3 100644 --- a/epan/dissectors/packet-pflog.c +++ b/epan/dissectors/packet-pflog.c @@ -32,9 +32,7 @@ http://www.openbsd.org/cgi-bin/cvsweb/src/sys/net/if_pflog.c http://www.openbsd.org/cgi-bin/cvsweb/src/sys/net/if_pflog.h */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 9afefdb81b..dd01a5c086 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.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> #include <epan/afn.h> diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c index 4090346f40..831738d77f 100644 --- a/epan/dissectors/packet-pgsql.c +++ b/epan/dissectors/packet-pgsql.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/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 5c0441b4b1..81c8d27610 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.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/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c index b8d5fd59be..38520ede50 100644 --- a/epan/dissectors/packet-pingpongprotocol.c +++ b/epan/dissectors/packet-pingpongprotocol.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 <epan/packet.h> #include <epan/sctpppids.h> diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index b12c9b34f7..9a08bb6116 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -31,9 +31,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/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 7891fa9679..277cc6d4b2 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -31,9 +31,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/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index 126f9cb14b..83de189980 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -31,9 +31,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/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index 34acb11f64..32e0cdeec6 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.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 "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index f8a7a3d1ae..1b72ca3ee0 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -30,9 +30,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/epan/dissectors/packet-pkixac.c b/epan/dissectors/packet-pkixac.c index 2db5632bd0..c9505d26c1 100644 --- a/epan/dissectors/packet-pkixac.c +++ b/epan/dissectors/packet-pkixac.c @@ -33,9 +33,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/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index 9379c861c5..c9b84364ae 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -31,9 +31,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/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index 4f2b066567..970a808517 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -31,9 +31,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/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index c038d32d69..d08d518f5a 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -31,9 +31,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/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index 8a83bdb50c..b31dc4124a 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -30,9 +30,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/asn1.h> diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c index 199dc6b734..deee954768 100644 --- a/epan/dissectors/packet-pktgen.c +++ b/epan/dissectors/packet-pktgen.c @@ -29,9 +29,7 @@ * See linux/net/core/pktgen.c and linux/Documentation/networking/pktgen.txt for more info. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 259310c628..8b5940f614 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -30,9 +30,7 @@ This dissector is based on Revision 6.1.2 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c index 1fd92f3301..724088073d 100644 --- a/epan/dissectors/packet-pop.c +++ b/epan/dissectors/packet-pop.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 <stdlib.h> diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index 567c6753ab..1714176b2c 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.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 diff --git a/epan/dissectors/packet-ppcap.c b/epan/dissectors/packet-ppcap.c index 84e0e9941d..48731149fa 100644 --- a/epan/dissectors/packet-ppcap.c +++ b/epan/dissectors/packet-ppcap.c @@ -24,9 +24,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ppi-antenna.c b/epan/dissectors/packet-ppi-antenna.c index d628034fff..b32b0d3ca5 100644 --- a/epan/dissectors/packet-ppi-antenna.c +++ b/epan/dissectors/packet-ppi-antenna.c @@ -25,9 +25,7 @@ * 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/epan/dissectors/packet-ppi-gps.c b/epan/dissectors/packet-ppi-gps.c index 7b29c4c25e..b31fb13cdf 100644 --- a/epan/dissectors/packet-ppi-gps.c +++ b/epan/dissectors/packet-ppi-gps.c @@ -25,9 +25,7 @@ * 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/epan/dissectors/packet-ppi-sensor.c b/epan/dissectors/packet-ppi-sensor.c index d9129fc30c..7b9ae480bc 100644 --- a/epan/dissectors/packet-ppi-sensor.c +++ b/epan/dissectors/packet-ppi-sensor.c @@ -25,9 +25,7 @@ * 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/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c index 2ee91a8cee..390da511c8 100644 --- a/epan/dissectors/packet-ppi-vector.c +++ b/epan/dissectors/packet-ppi-vector.c @@ -31,9 +31,7 @@ * 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/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 663fd4e59d..3324a55b08 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -45,9 +45,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 1ab8326bca..b947754d41 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.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/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 6aae01ff22..b832838f65 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.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/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index a63c416932..4c4d391e64 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.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/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 2044ee652c..57fad9a537 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.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 "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index 7e6f2951df..84e5c99c3e 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.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/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index 26f1e34ea3..94392ed787 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -41,9 +41,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 <math.h> diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 81793f7040..abafb80ff0 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -31,9 +31,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 <ctype.h> diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c index 921252f6ed..b0e399f752 100644 --- a/epan/dissectors/packet-pw-atm.c +++ b/epan/dissectors/packet-pw-atm.c @@ -36,9 +36,7 @@ - ATM AAL5 PDU Mode */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c index 3437b9205b..4fc01c1891 100644 --- a/epan/dissectors/packet-pw-cesopsn.c +++ b/epan/dissectors/packet-pw-cesopsn.c @@ -32,9 +32,7 @@ * - Decoding of PW payload */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c index 98f3830d3d..7189d0bf45 100644 --- a/epan/dissectors/packet-pw-common.c +++ b/epan/dissectors/packet-pw-common.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-pw-common.h" diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c index 47b7687698..f6071d0837 100644 --- a/epan/dissectors/packet-pw-eth.c +++ b/epan/dissectors/packet-pw-eth.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> diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c index 5a519db1d8..7053ea62e5 100644 --- a/epan/dissectors/packet-pw-fr.c +++ b/epan/dissectors/packet-pw-fr.c @@ -31,9 +31,7 @@ * - FR DLCI Martini (legacy) mode (i.e. legacy CW). */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c index c873e37cdb..9c23c47fb3 100644 --- a/epan/dissectors/packet-pw-hdlc.c +++ b/epan/dissectors/packet-pw-hdlc.c @@ -34,9 +34,7 @@ * - For HDLC mode, decoding payloads other than PPP.] */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index 14772b091f..c594dd0ece 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -31,9 +31,7 @@ * - Optional RTP Headers (RFC3550) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index 64527ad0f3..680a60869c 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.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/epan/dissectors/packet-q708.c b/epan/dissectors/packet-q708.c index 0d07683bd4..409bc5cab0 100644 --- a/epan/dissectors/packet-q708.c +++ b/epan/dissectors/packet-q708.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 2e826710be..dd94923d85 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.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 <string.h> diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index 1bc20f62c0..f4169a0285 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -31,9 +31,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/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index a170a9d50f..1132df38c9 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -31,9 +31,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/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index 8f7f4be89a..038aabc086 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.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/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c index dfd620ebe8..7e88e0a0d6 100644 --- a/epan/dissectors/packet-qllc.c +++ b/epan/dissectors/packet-qllc.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/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 1d382c459f..9a81f44adf 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -31,9 +31,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/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c index 045cb4723c..89e44ebd4a 100644 --- a/epan/dissectors/packet-quake.c +++ b/epan/dissectors/packet-quake.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c index 2aae3dddde..3cf8770403 100644 --- a/epan/dissectors/packet-quake2.c +++ b/epan/dissectors/packet-quake2.c @@ -30,9 +30,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/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c index ba9a06f267..094c27eb9f 100644 --- a/epan/dissectors/packet-quake3.c +++ b/epan/dissectors/packet-quake3.c @@ -37,9 +37,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c index 86f581fa54..a99014048e 100644 --- a/epan/dissectors/packet-quakeworld.c +++ b/epan/dissectors/packet-quakeworld.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 <glib.h> diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 2eaf33b749..c6302ccda6 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -53,9 +53,7 @@ - dissect_3gpp_ipv6_dns_servers() */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <string.h> diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c index 85f6cea4db..756a723af9 100644 --- a/epan/dissectors/packet-radius_packetcable.c +++ b/epan/dissectors/packet-radius_packetcable.c @@ -42,9 +42,7 @@ PacketCable(TM) Specification: Multimedia Specification [PKT-SP-MM-I04-080522] */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/packet.h> #include <epan/sminmpec.h> diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index aa5a28f4d8..733de9dc23 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -33,9 +33,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/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c index 3ff653f5f6..fe11a8623b 100644 --- a/epan/dissectors/packet-raw.c +++ b/epan/dissectors/packet-raw.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 <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c index d6e7404135..246268c348 100644 --- a/epan/dissectors/packet-rdm.c +++ b/epan/dissectors/packet-rdm.c @@ -42,9 +42,7 @@ * reporting back to the control console. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index 763303234e..1fcefb2251 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -24,9 +24,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index d2b283058b..7f1eadbcb6 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -32,9 +32,7 @@ * server/protocol/transport/rdt/pub/tngpkt.pm */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index 151367b593..fc0ef0aa62 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.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/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c index bc66039227..7b01fd66ad 100644 --- a/epan/dissectors/packet-redbackli.c +++ b/epan/dissectors/packet-redbackli.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 <glib.h> diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index f965c163f6..8ab70ceb3a 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -27,9 +27,7 @@ * - draft-ietf-p2psip-base-15 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/conversation.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index 03421c2212..7a662d108c 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -32,9 +32,7 @@ * - draft-zong-p2psip-drr-01 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/conversation.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c index ae38ce4288..e76ac14031 100644 --- a/epan/dissectors/packet-retix-bpdu.c +++ b/epan/dissectors/packet-retix-bpdu.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" #if 0 #endif diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c index a62c0e012e..4a34d0f708 100644 --- a/epan/dissectors/packet-rfc2190.c +++ b/epan/dissectors/packet-rfc2190.c @@ -34,9 +34,7 @@ * RFC 2190, http://www.ietf.org/rfc/rfc2190.txt */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-rfid-felica.c b/epan/dissectors/packet-rfid-felica.c index 6f3060681c..a106631925 100644 --- a/epan/dissectors/packet-rfid-felica.c +++ b/epan/dissectors/packet-rfid-felica.c @@ -31,9 +31,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-rfid-mifare.c b/epan/dissectors/packet-rfid-mifare.c index ae0bdcf920..269a756cf9 100644 --- a/epan/dissectors/packet-rfid-mifare.c +++ b/epan/dissectors/packet-rfid-mifare.c @@ -30,9 +30,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c index b3fcebae07..91e03460dc 100644 --- a/epan/dissectors/packet-rfid-pn532.c +++ b/epan/dissectors/packet-rfid-pn532.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c index eceededcb8..9a5eeb11e8 100644 --- a/epan/dissectors/packet-rgmp.c +++ b/epan/dissectors/packet-rgmp.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/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index 55c2e6fbea..3065e2e89e 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.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 <string.h> diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index b3c2fc14d5..587d160dc4 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.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> #include <glib.h> diff --git a/epan/dissectors/packet-rlm.c b/epan/dissectors/packet-rlm.c index c942b24547..95b2519436 100644 --- a/epan/dissectors/packet-rlm.c +++ b/epan/dissectors/packet-rlm.c @@ -47,9 +47,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index 91f55686cb..f149f35aa1 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.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 <stdlib.h> #include <string.h> diff --git a/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c index 357968b5e4..9d7dc95374 100644 --- a/epan/dissectors/packet-rmcp.c +++ b/epan/dissectors/packet-rmcp.c @@ -27,9 +27,7 @@ * 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c index 4e6500c351..bce46e069d 100644 --- a/epan/dissectors/packet-rmi.c +++ b/epan/dissectors/packet-rmi.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 <string.h> diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c index 897d6a72e3..ccdcbf7f01 100644 --- a/epan/dissectors/packet-rmp.c +++ b/epan/dissectors/packet-rmp.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/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c index 4b8ec75b95..1913a0d904 100644 --- a/epan/dissectors/packet-rmt-alc.c +++ b/epan/dissectors/packet-rmt-alc.c @@ -38,9 +38,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/epan/dissectors/packet-rmt-common.c b/epan/dissectors/packet-rmt-common.c index 757c90fe41..d02ba65887 100644 --- a/epan/dissectors/packet-rmt-common.c +++ b/epan/dissectors/packet-rmt-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 "config.h" #include <string.h> diff --git a/epan/dissectors/packet-rmt-fec.c b/epan/dissectors/packet-rmt-fec.c index c53d801e50..11a825821d 100644 --- a/epan/dissectors/packet-rmt-fec.c +++ b/epan/dissectors/packet-rmt-fec.c @@ -38,9 +38,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/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c index f4e8483dfe..31810eb904 100644 --- a/epan/dissectors/packet-rmt-lct.c +++ b/epan/dissectors/packet-rmt-lct.c @@ -38,9 +38,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/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c index 6fb37632ac..c033453917 100644 --- a/epan/dissectors/packet-rmt-norm.c +++ b/epan/dissectors/packet-rmt-norm.c @@ -39,9 +39,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/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index be91f8908c..c89f704543 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -36,9 +36,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/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index b617cb6b33..72a0c6a0c8 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -30,9 +30,7 @@ * http://datatracker.ietf.org/doc/rfc5225/ RObust Header Compression Version 2 (ROHCv2): Profiles for RTP, UDP, IP, ESP and UDP-Lite */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c index 56601151ca..7450eccda1 100644 --- a/epan/dissectors/packet-roofnet.c +++ b/epan/dissectors/packet-roofnet.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/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index f36dd2decc..0c3902fd67 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -31,9 +31,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/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index dceeb7625c..6b08dac9ca 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.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> diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 68b0e4c3c2..861823a23a 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.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 #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c index ef7b99d63c..6238d5b266 100644 --- a/epan/dissectors/packet-rpl.c +++ b/epan/dissectors/packet-rpl.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/epan/dissectors/packet-rquota.c b/epan/dissectors/packet-rquota.c index ab963d9451..c266d65275 100644 --- a/epan/dissectors/packet-rquota.c +++ b/epan/dissectors/packet-rquota.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 diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 27ee195d0e..4ac9f85b70 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -41,9 +41,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/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index a697a43c4f..afad4aa323 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -34,9 +34,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/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c index c44b8c9158..84d01ae2a3 100644 --- a/epan/dissectors/packet-rsh.c +++ b/epan/dissectors/packet-rsh.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 <ctype.h> diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c index 18055db8ed..919027db7e 100644 --- a/epan/dissectors/packet-rsip.c +++ b/epan/dissectors/packet-rsip.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> diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index bea8fff531..b3da9e3d96 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -31,9 +31,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-rstat.c b/epan/dissectors/packet-rstat.c index 693db485de..b7003174f4 100644 --- a/epan/dissectors/packet-rstat.c +++ b/epan/dissectors/packet-rstat.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 diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 3f07caa712..b19faeba32 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -91,9 +91,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index 13a1c9fd1d..0ec48af139 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.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 <string.h> diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index efd2412901..e379096918 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -62,9 +62,7 @@ * (http://www.iana.org/assignments/rtcp-xr-block-types/rtcp-xr-block-types.xml). */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index f474387e47..43f447d682 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -50,9 +50,7 @@ * Default TCP port is 1935 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index 8ec9f3dca9..b6aefb5c94 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -27,9 +27,7 @@ /* Include files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c index 3f9dcdd6ec..ed91e1042d 100644 --- a/epan/dissectors/packet-rtp-events.c +++ b/epan/dissectors/packet-rtp-events.c @@ -35,9 +35,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c index b0ec9a13ab..e91ce261df 100644 --- a/epan/dissectors/packet-rtp-midi.c +++ b/epan/dissectors/packet-rtp-midi.c @@ -48,9 +48,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 390038be5d..5f80d3ce54 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -56,9 +56,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index b61aef7fb7..9d2a61f561 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -50,9 +50,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c index 38debe782f..354bee833f 100644 --- a/epan/dissectors/packet-rtps2.c +++ b/epan/dissectors/packet-rtps2.c @@ -52,9 +52,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index a2d30a9cf5..5c559afabb 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -31,9 +31,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/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 20f4217562..19f1845413 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -29,9 +29,7 @@ * http://www.iana.org/assignments/rsvp-parameters */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c index 6663024827..e446acc991 100644 --- a/epan/dissectors/packet-rua.c +++ b/epan/dissectors/packet-rua.c @@ -33,9 +33,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/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c index 5ac7ea7b51..e623652229 100644 --- a/epan/dissectors/packet-rudp.c +++ b/epan/dissectors/packet-rudp.c @@ -42,9 +42,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-rwall.c b/epan/dissectors/packet-rwall.c index f29f0fed97..0a3df1180b 100644 --- a/epan/dissectors/packet-rwall.c +++ b/epan/dissectors/packet-rwall.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 diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index a5e5963008..dd46df520a 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index 462d0f9f33..f49c889d75 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -35,9 +35,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/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c index 8e3d449aa8..a70f89469d 100644 --- a/epan/dissectors/packet-s5066.c +++ b/epan/dissectors/packet-s5066.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/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c index e312998974..224ec23a05 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -33,9 +33,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/epan/dissectors/packet-sadmind.c b/epan/dissectors/packet-sadmind.c index b86a54770f..759440ec55 100644 --- a/epan/dissectors/packet-sadmind.c +++ b/epan/dissectors/packet-sadmind.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 diff --git a/epan/dissectors/packet-sametime.c b/epan/dissectors/packet-sametime.c index 1a6d133c4b..07dbf63db3 100644 --- a/epan/dissectors/packet-sametime.c +++ b/epan/dissectors/packet-sametime.c @@ -23,9 +23,7 @@ * 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/dissectors/packet-tcp.h> diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c index 2079a2b23f..ade2b6dc23 100644 --- a/epan/dissectors/packet-sap.c +++ b/epan/dissectors/packet-sap.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> #include <glib.h> diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index 56ab5ce474..9680b77712 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.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/epan/dissectors/packet-sbc-ap.c b/epan/dissectors/packet-sbc-ap.c index 7ca7f67435..d063372027 100644 --- a/epan/dissectors/packet-sbc-ap.c +++ b/epan/dissectors/packet-sbc-ap.c @@ -32,9 +32,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/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index 90f65768b6..9c472fe1b3 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.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/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 961963c30b..855051e167 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -36,9 +36,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c index 6f7eda753e..4bc26e965f 100644 --- a/epan/dissectors/packet-sccpmg.c +++ b/epan/dissectors/packet-sccpmg.c @@ -33,9 +33,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/epan/dissectors/packet-scop.c b/epan/dissectors/packet-scop.c index d661bb8e0c..2ad2002a64 100644 --- a/epan/dissectors/packet-scop.c +++ b/epan/dissectors/packet-scop.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 <epan/packet.h> diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c index e89f8135ae..2af1000b56 100644 --- a/epan/dissectors/packet-scriptingservice.c +++ b/epan/dissectors/packet-scriptingservice.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 <epan/packet.h> #include <epan/sctpppids.h> diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c index 47c88c6474..d41ff5ad41 100644 --- a/epan/dissectors/packet-scsi-mmc.c +++ b/epan/dissectors/packet-scsi-mmc.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/strutil.h> diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index 3c4c5c1773..e080e6f8fe 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.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/strutil.h> diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index a1fcee9b17..142efb7d69 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/epan/dissectors/packet-scsi-sbc.c @@ -36,9 +36,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/strutil.h> diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c index e2ecd15b59..54645c0b84 100644 --- a/epan/dissectors/packet-scsi-smc.c +++ b/epan/dissectors/packet-scsi-smc.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 <glib.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c index 984f0e2f4c..c128955993 100644 --- a/epan/dissectors/packet-scsi-ssc.c +++ b/epan/dissectors/packet-scsi-ssc.c @@ -31,9 +31,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/strutil.h> diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 712b96a396..4688c16b55 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -79,9 +79,7 @@ * decoder has not been able to determine. * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 008db7e7f1..dd17a533d4 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -51,9 +51,7 @@ * PPID types updated by Thomas Dreibholz (Feb 2011) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-sdh.c b/epan/dissectors/packet-sdh.c index 38079b2481..33ea6cebce 100644 --- a/epan/dissectors/packet-sdh.c +++ b/epan/dissectors/packet-sdh.c @@ -22,9 +22,7 @@ * 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/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c index 7f51d85a73..412c506a46 100644 --- a/epan/dissectors/packet-sdlc.c +++ b/epan/dissectors/packet-sdlc.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/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index 4e2977527b..c08c803b13 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -26,9 +26,7 @@ * Ref http://www.ietf.org/rfc/rfc4566.txt?number=4566 */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <string.h> diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c index 9c46798b46..18184c645d 100644 --- a/epan/dissectors/packet-sebek.c +++ b/epan/dissectors/packet-sebek.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> #include <time.h> diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index 828bf675e4..16c4290ced 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -31,9 +31,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/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index d1207aae04..f3b20780f2 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.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> diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 61ab14a910..ae8bbcd269 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -50,9 +50,7 @@ * implement non-generic counters sampling (sFlow v2/4) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index 1732c60c5f..728222d201 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -26,9 +26,7 @@ * References: 3GPP TS 29.118 V10.2.0 (2010-12) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index c3a60943b4..286baa9efc 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -30,9 +30,7 @@ * http://www.ietf.org/internet-drafts/draft-ietf-rohc-sigcomp-sip-01.txt */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <math.h> #include <glib.h> diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c index 9679b95ea8..e45d6096f5 100644 --- a/epan/dissectors/packet-simulcrypt.c +++ b/epan/dissectors/packet-simulcrypt.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index c8d1e6aed5..5cf90036f4 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -33,9 +33,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 <ctype.h> diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c index 66d532b91f..f18b49a4db 100644 --- a/epan/dissectors/packet-sipfrag.c +++ b/epan/dissectors/packet-sipfrag.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/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c index bea11cb2b1..95eb99899f 100644 --- a/epan/dissectors/packet-sita.c +++ b/epan/dissectors/packet-sita.c @@ -27,9 +27,7 @@ /* Use indentation = 4 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 9f041b6301..5edbfad503 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -36,9 +36,7 @@ * specification */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-skype.c b/epan/dissectors/packet-skype.c index 73e7d9e403..78a9a6f58a 100644 --- a/epan/dissectors/packet-skype.c +++ b/epan/dissectors/packet-skype.c @@ -40,9 +40,7 @@ * - Improve tests */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index 0452df9cd1..4580c3248d 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.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 <glib.h> #include <string.h> diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index adc8da2843..741c6faf24 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.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/arptypes.h> diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index 6cca452849..0acff1a371 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.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 <glib.h> diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 8948e5032c..2e2fa3eade 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -30,9 +30,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/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index 6f50a773cb..a6792c5eec 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.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/epan/dissectors/packet-smb-common.c b/epan/dissectors/packet-smb-common.c index fdac03440e..834cac3e51 100644 --- a/epan/dissectors/packet-smb-common.c +++ b/epan/dissectors/packet-smb-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 <glib.h> diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index 632b694479..854ee790bf 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.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> diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c index 5f82bb471c..f7b62b3a0a 100644 --- a/epan/dissectors/packet-smb-mailslot.c +++ b/epan/dissectors/packet-smb-mailslot.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/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index cb62c91b50..37ae7a1d5d 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -31,9 +31,7 @@ XXX Fixme : shouldn't show [malformed frame] for long packets * 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/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c index 12f7ac1732..4ed5799401 100644 --- a/epan/dissectors/packet-smb-sidsnooping.c +++ b/epan/dissectors/packet-smb-sidsnooping.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> #include <string.h> diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 72830cf7a6..57f389c640 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.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/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 858277f254..6af2e6d908 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -30,9 +30,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/conversation.h> diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index b26e4650ef..2f8d989f14 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -50,9 +50,7 @@ * (document version: 12-Oct-1999 Issue 1.2) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <time.h> diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index f580bb1be9..7bb4a1cf72 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -31,9 +31,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/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index 708ade6101..60399bdd85 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.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 <stdlib.h> #include <ctype.h> diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 651e7cf6c2..3ace2e4974 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.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/epan/dissectors/packet-snaeth.c b/epan/dissectors/packet-snaeth.c index d5b57ce96a..c3d0e0cf78 100644 --- a/epan/dissectors/packet-snaeth.c +++ b/epan/dissectors/packet-snaeth.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/epan/dissectors/packet-sndcp-xid.c b/epan/dissectors/packet-sndcp-xid.c index 65ec94500a..89db6541ff 100644 --- a/epan/dissectors/packet-sndcp-xid.c +++ b/epan/dissectors/packet-sndcp-xid.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> diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c index b5df2c77bc..eaa85aff6c 100644 --- a/epan/dissectors/packet-sndcp.c +++ b/epan/dissectors/packet-sndcp.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/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index f4333f8510..cfcea11086 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -54,9 +54,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/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index 330784eb37..52cdb2970b 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.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/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index a034beee17..5f30aa887e 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -65,9 +65,7 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index 613b463eac..df67ba7856 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -27,9 +27,7 @@ * and the source - git://cgit.freedesktop.org/spice/spice-protocol */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index f24afd3eb7..08de952121 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -39,9 +39,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/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c index fdf7b5b51e..d5c72610cf 100644 --- a/epan/dissectors/packet-spp.c +++ b/epan/dissectors/packet-spp.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/epan/dissectors/packet-spray.c b/epan/dissectors/packet-spray.c index d9b703df87..fbdaba14bc 100644 --- a/epan/dissectors/packet-spray.c +++ b/epan/dissectors/packet-spray.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 diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index 1e9a30620a..de28acffe0 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -33,9 +33,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c index 1856033cb7..0c58b4e61c 100644 --- a/epan/dissectors/packet-sqloracle.c +++ b/epan/dissectors/packet-sqloracle.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define TCP_PORT_TNS 1522 /* XXX 1521 collides with packet-tns.c */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <ctype.h> diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c index fd5b44d996..b3dd164746 100644 --- a/epan/dissectors/packet-srp.c +++ b/epan/dissectors/packet-srp.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/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index bc7521661f..6b88d5a6ba 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.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 <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c index d04dd17d66..4fcf895242 100644 --- a/epan/dissectors/packet-sscf-nni.c +++ b/epan/dissectors/packet-sscf-nni.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/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c index 8aabb86148..1c5abdfd75 100644 --- a/epan/dissectors/packet-sscop.c +++ b/epan/dissectors/packet-sscop.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/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 38f22195ca..590a2a1b1d 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -44,9 +44,7 @@ /* "SSH" prefixes are for version 2, whereas "SSH1" is for version 1 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index ca459bbb1c..9f911afb92 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.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" #ifdef HAVE_LIBZ #include <zlib.h> diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 412d32e725..9874bf674b 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -88,9 +88,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c index ef16408c6a..cdc9aef541 100644 --- a/epan/dissectors/packet-starteam.c +++ b/epan/dissectors/packet-starteam.c @@ -29,9 +29,7 @@ * StarTeam is a Software Change & Configuration Management Tool (like CVS) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-stat-notify.c b/epan/dissectors/packet-stat-notify.c index e9dd58aeb4..a5ec6f4674 100644 --- a/epan/dissectors/packet-stat-notify.c +++ b/epan/dissectors/packet-stat-notify.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 "packet-rpc.h" diff --git a/epan/dissectors/packet-stat.c b/epan/dissectors/packet-stat.c index 9515a5afc9..16844c59a7 100644 --- a/epan/dissectors/packet-stat.c +++ b/epan/dissectors/packet-stat.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 "packet-rpc.h" diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index ee4159a2b6..26cd560cca 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -33,9 +33,7 @@ * - draft-ietf-behave-turn-ipv6-11 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index d579c9dd91..06acd70127 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.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 <string.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c index 9716441a0c..eca2e050cc 100644 --- a/epan/dissectors/packet-sv.c +++ b/epan/dissectors/packet-sv.c @@ -31,9 +31,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/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c index 1f24fb5e3a..7c0c1743ec 100644 --- a/epan/dissectors/packet-symantec.c +++ b/epan/dissectors/packet-symantec.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/epan/dissectors/packet-sync.c b/epan/dissectors/packet-sync.c index 62a12adb3d..38d711c360 100644 --- a/epan/dissectors/packet-sync.c +++ b/epan/dissectors/packet-sync.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index 255980f94f..cd1c741b06 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.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 <string.h> diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 9e23426391..7efbf1c16f 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.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/conversation.h> diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c index 30798cc3b8..f7b4d262dd 100644 --- a/epan/dissectors/packet-syslog.c +++ b/epan/dissectors/packet-syslog.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 <string.h> #include <ctype.h> diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c index c12c7e9b59..f901c82d18 100644 --- a/epan/dissectors/packet-t124.c +++ b/epan/dissectors/packet-t124.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/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index 916c777101..5c0d706a91 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.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/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c index b2ba741d16..e551835bc1 100644 --- a/epan/dissectors/packet-t30.c +++ b/epan/dissectors/packet-t30.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 <glib/gprintf.h> diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index fde0c1a81c..dcb879bed3 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -52,9 +52,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 99d2c52ac6..eb1fabc9b5 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -34,9 +34,7 @@ * ftp://ftp.cisco.com/pub/rfc/DRAFTS/draft-grant-tacacs-02.txt */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c index e62b93b55e..e8e694b8b2 100644 --- a/epan/dissectors/packet-tali.c +++ b/epan/dissectors/packet-tali.c @@ -31,9 +31,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-tango.c b/epan/dissectors/packet-tango.c index 1b0625707e..dcea82f50a 100644 --- a/epan/dissectors/packet-tango.c +++ b/epan/dissectors/packet-tango.c @@ -35,9 +35,7 @@ static int hf_operationrequest = -1;/* Request_Operation field */ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gmodule.h> diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c index 114ac482d3..eaafa8a723 100644 --- a/epan/dissectors/packet-tapa.c +++ b/epan/dissectors/packet-tapa.c @@ -32,9 +32,7 @@ Specs: No specs available. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 8139728550..bacafe5024 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -33,9 +33,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/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index dba4e42761..1310fadbb7 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.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/epan/dissectors/packet-tdmoe.c b/epan/dissectors/packet-tdmoe.c index 37f06f3cb0..4c5670b31d 100644 --- a/epan/dissectors/packet-tdmoe.c +++ b/epan/dissectors/packet-tdmoe.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/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index b77626ecc5..83c1c947cd 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -144,9 +144,7 @@ * up and fix crashes. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <ctype.h> diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index a1ccb4c636..ba8ff0ca32 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.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> diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c index d4c96526f3..f035066c97 100644 --- a/epan/dissectors/packet-teimanagement.c +++ b/epan/dissectors/packet-teimanagement.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/epan/dissectors/packet-teklink.c b/epan/dissectors/packet-teklink.c index cf6726e121..63f769af47 100644 --- a/epan/dissectors/packet-teklink.c +++ b/epan/dissectors/packet-teklink.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 "packet-rpc.h" diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c index b90308cdaf..5e09bb2fc6 100644 --- a/epan/dissectors/packet-telkonet.c +++ b/epan/dissectors/packet-telkonet.c @@ -31,9 +31,7 @@ * as well: find out what they do */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 79855883c5..a70847b150 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -27,9 +27,7 @@ /* Telnet authentication options as per RFC2941 * Kerberos v5 telnet authentication as per RFC2942 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> #include <string.h> diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index 3978d088d2..145931de94 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.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 <glib.h> diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c index 4ce8f7a839..08fa7d30de 100644 --- a/epan/dissectors/packet-tetra.c +++ b/epan/dissectors/packet-tetra.c @@ -36,9 +36,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/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c index bbf3cb5e80..e4e7358abe 100644 --- a/epan/dissectors/packet-text-media.c +++ b/epan/dissectors/packet-text-media.c @@ -32,9 +32,7 @@ /* Edit this file with 4-space tabs */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 41016296ed..021e08f2fc 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -40,9 +40,7 @@ * (not yet implemented) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-time.c b/epan/dissectors/packet-time.c index 13f4981737..de92d2cf16 100644 --- a/epan/dissectors/packet-time.c +++ b/epan/dissectors/packet-time.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 <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 93d6253d02..929d3d2597 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -30,9 +30,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/prefs.h> diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c index 268d138af7..68b12087b6 100644 --- a/epan/dissectors/packet-tivoconnect.c +++ b/epan/dissectors/packet-tivoconnect.c @@ -37,9 +37,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index eab136673c..87bef37706 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -45,9 +45,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/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index 0f84ba0b54..171e4c7552 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -31,9 +31,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c index 158e77ce31..2ebf1414dd 100644 --- a/epan/dissectors/packet-tnef.c +++ b/epan/dissectors/packet-tnef.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/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index 5a11861e9a..52b36abac7 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.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/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index e4a262b52e..c9b9bc27a7 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.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/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index 5209bae9b6..8e1a28b12f 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -26,9 +26,7 @@ /*-------------------------------------------------------------------------------------------------------------------------------------------*/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 24d26df8b1..0b9ac93cd1 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.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 <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c index 5b71af9ebf..d3134a5bd3 100644 --- a/epan/dissectors/packet-trill.c +++ b/epan/dissectors/packet-trill.c @@ -27,9 +27,7 @@ * See: http://tools.ietf.org/html/draft-ietf-trill-rbridge-protocol-16 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index bd97dbc3d3..2cad6caf7d 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.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 <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c index 72aa590f0d..939af78bd7 100644 --- a/epan/dissectors/packet-tsp.c +++ b/epan/dissectors/packet-tsp.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/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c index 2c8023cda0..8b1cb7a9b7 100644 --- a/epan/dissectors/packet-tte-pcf.c +++ b/epan/dissectors/packet-tte-pcf.c @@ -29,9 +29,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-tte.c b/epan/dissectors/packet-tte.c index 7eaebd8dc7..88798cca09 100644 --- a/epan/dissectors/packet-tte.c +++ b/epan/dissectors/packet-tte.c @@ -29,9 +29,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index 4aa10032ac..54a5442d01 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -35,9 +35,7 @@ * everything else is based on (educated) guesses. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c index 18bd6c1161..e15a2895fc 100644 --- a/epan/dissectors/packet-turnchannel.c +++ b/epan/dissectors/packet-turnchannel.c @@ -31,9 +31,7 @@ * - draft-ietf-behave-turn-ipv6-03 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c index 9defce4fe0..6ba3028869 100644 --- a/epan/dissectors/packet-tuxedo.c +++ b/epan/dissectors/packet-tuxedo.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/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index 3e5af53195..c63272821b 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.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> diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c index d8b3f39f8a..191e8e2746 100644 --- a/epan/dissectors/packet-ua.c +++ b/epan/dissectors/packet-ua.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/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index 59227f9674..8ac904f286 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.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 <ctype.h> diff --git a/epan/dissectors/packet-uasip.c b/epan/dissectors/packet-uasip.c index 5294e6b5df..f9c823da81 100644 --- a/epan/dissectors/packet-uasip.c +++ b/epan/dissectors/packet-uasip.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 <string.h> diff --git a/epan/dissectors/packet-uaudp.c b/epan/dissectors/packet-uaudp.c index f199665715..ebe8eee81f 100644 --- a/epan/dissectors/packet-uaudp.c +++ b/epan/dissectors/packet-uaudp.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/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index 7d24da771e..c66c62295a 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -33,9 +33,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c index 6f0496b052..e609e2fec6 100644 --- a/epan/dissectors/packet-udld.c +++ b/epan/dissectors/packet-udld.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/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index f460d6ec54..2249baaeaa 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.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/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c index b7d6a97797..25a2b4778d 100644 --- a/epan/dissectors/packet-ulp.c +++ b/epan/dissectors/packet-ulp.c @@ -34,9 +34,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/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 660dd60ded..0cf5eda73a 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -53,9 +53,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 51f8aff8a5..dfbd7bbce8 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.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/expert.h> diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 106c3c9bae..e690a884fb 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.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/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c index 16226aced3..4c4138b1a0 100644 --- a/epan/dissectors/packet-usb-ccid.c +++ b/epan/dissectors/packet-usb-ccid.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index 73b1e36548..a78b6c1557 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.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/epan/dissectors/packet-usb-hub.c b/epan/dissectors/packet-usb-hub.c index d23f02c694..7c84b27311 100644 --- a/epan/dissectors/packet-usb-hub.c +++ b/epan/dissectors/packet-usb-hub.c @@ -27,9 +27,7 @@ * 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/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c index e99697b6f1..62d4203061 100644 --- a/epan/dissectors/packet-usb-masstorage.c +++ b/epan/dissectors/packet-usb-masstorage.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/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 059a8b678f..750fb3fb11 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -24,9 +24,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <ctype.h> #include "isprint.h" diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c index e4393108fa..79300b724e 100644 --- a/epan/dissectors/packet-user_encap.c +++ b/epan/dissectors/packet-user_encap.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/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c index 6d091fa897..f2d8c88d98 100644 --- a/epan/dissectors/packet-uts.c +++ b/epan/dissectors/packet-uts.c @@ -27,9 +27,7 @@ /* Use tabstops = 4 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c index bf86b1992b..f4390ad7ca 100644 --- a/epan/dissectors/packet-v120.c +++ b/epan/dissectors/packet-v120.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/epan/dissectors/packet-v150fw.c b/epan/dissectors/packet-v150fw.c index 24fd73aa6a..0d90e6facd 100644 --- a/epan/dissectors/packet-v150fw.c +++ b/epan/dissectors/packet-v150fw.c @@ -28,9 +28,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c index bb87cf48fe..b7e4d72c38 100644 --- a/epan/dissectors/packet-v52.c +++ b/epan/dissectors/packet-v52.c @@ -31,9 +31,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/epan/dissectors/packet-v5dl.c b/epan/dissectors/packet-v5dl.c index 96f5db40d7..dee6a90445 100644 --- a/epan/dissectors/packet-v5dl.c +++ b/epan/dissectors/packet-v5dl.c @@ -32,9 +32,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-v5ef.c b/epan/dissectors/packet-v5ef.c index d090bd815d..bd130787b5 100644 --- a/epan/dissectors/packet-v5ef.c +++ b/epan/dissectors/packet-v5ef.c @@ -31,9 +31,7 @@ * ETS 300 347-1 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index 35a0c6ed60..17aad6e12c 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -41,9 +41,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/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index ec159c1bbb..525eb57f23 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.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/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c index e9f4f32284..21ccb0e7c4 100644 --- a/epan/dissectors/packet-vicp.c +++ b/epan/dissectors/packet-vicp.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> #include <epan/ptvcursor.h> diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index 32de47dd96..41784bef9f 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -69,9 +69,7 @@ * 0x0baf Vines Echo */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-vj.c b/epan/dissectors/packet-vj.c index 833fcf566d..188822654d 100644 --- a/epan/dissectors/packet-vj.c +++ b/epan/dissectors/packet-vj.c @@ -59,9 +59,7 @@ * Rewrite to make the code work for wireshark. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <string.h> diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index 9cc1fc5091..dbddf10758 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.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/epan/dissectors/packet-vmlab.c b/epan/dissectors/packet-vmlab.c index ca098ae3c1..7eec47b5e9 100644 --- a/epan/dissectors/packet-vmlab.c +++ b/epan/dissectors/packet-vmlab.c @@ -41,9 +41,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index ec903d1344..c45e2d047b 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -42,9 +42,7 @@ * and the RealVNC free edition & TightVNC source code */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-vntag.c b/epan/dissectors/packet-vntag.c index 3ec3e3beb1..a55d2dc42e 100644 --- a/epan/dissectors/packet-vntag.c +++ b/epan/dissectors/packet-vntag.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index 18910647d0..ac3cac1a3b 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-vssmonitoring.c b/epan/dissectors/packet-vssmonitoring.c index a044105783..3ed79be623 100644 --- a/epan/dissectors/packet-vssmonitoring.c +++ b/epan/dissectors/packet-vssmonitoring.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 <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index c91fe49cc5..4ef69925b4 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.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> diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c index 86f245bba5..9f89301ec9 100644 --- a/epan/dissectors/packet-vuze-dht.c +++ b/epan/dissectors/packet-vuze-dht.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> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-vxi11.c b/epan/dissectors/packet-vxi11.c index 9833bfe239..a704e85f31 100644 --- a/epan/dissectors/packet-vxi11.c +++ b/epan/dissectors/packet-vxi11.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 "packet-rpc.h" diff --git a/epan/dissectors/packet-vxlan.c b/epan/dissectors/packet-vxlan.c index df85379d22..45e6e0298c 100644 --- a/epan/dissectors/packet-vxlan.c +++ b/epan/dissectors/packet-vxlan.c @@ -27,9 +27,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c index 286069fd6b..7b633d11e4 100644 --- a/epan/dissectors/packet-wai.c +++ b/epan/dissectors/packet-wai.c @@ -33,9 +33,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-wap.c b/epan/dissectors/packet-wap.c index e09850500f..141812045d 100644 --- a/epan/dissectors/packet-wap.c +++ b/epan/dissectors/packet-wap.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index 8a29cc3d79..8ffe67824e 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -42,9 +42,7 @@ - Fix 802.11 frame dissection */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-waveagent.c b/epan/dissectors/packet-waveagent.c index 622a2db597..351d873bc7 100644 --- a/epan/dissectors/packet-waveagent.c +++ b/epan/dissectors/packet-waveagent.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/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index 3fd4ac7681..7f6226ce41 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -44,9 +44,7 @@ /* Edit this file with 4-space tabulation */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 9d423ad117..2cd9352ae3 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.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/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 81a40b9b3f..7666fa9c00 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -96,9 +96,7 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <glib.h> diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index d29a73673a..6d3f8cef06 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -23,9 +23,7 @@ * 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/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c index df124701c5..e75546fe08 100644 --- a/epan/dissectors/packet-wfleet-hdlc.c +++ b/epan/dissectors/packet-wfleet-hdlc.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/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c index 4c0422f3ee..00c0681315 100644 --- a/epan/dissectors/packet-who.c +++ b/epan/dissectors/packet-who.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 <time.h> #include <glib.h> diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index 99fbff8ca1..8fa5f39166 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.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 <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index e9a7918ca3..0341199a6c 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-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 <glib.h> #include <string.h> diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index 6262a9d35c..10c158e73c 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.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 <time.h> #include <glib.h> diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c index f848d2d5b2..f24d980622 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -31,9 +31,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/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 441c49ea2d..ef1e69ea63 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -59,9 +59,7 @@ * 0 (2 bytes) */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index e7ea802eb3..bac930e079 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -54,9 +54,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/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index 91bb9ac0c9..48c4e42b94 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -28,9 +28,7 @@ * SRP protocol documents (http://srp.stanford.edu) and RFC 2945: "The SRP * Authentication and Key Exchange System." */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index c717c2d846..36b5496605 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -34,9 +34,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-wreth.c b/epan/dissectors/packet-wreth.c index b899f9c724..88f2f34511 100644 --- a/epan/dissectors/packet-wreth.c +++ b/epan/dissectors/packet-wreth.c @@ -21,9 +21,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/> */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index 30ceaf12c6..e0fce3709c 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.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> diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index cef1082a0c..ee4e6a448d 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -42,9 +42,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/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c index 2c079394ca..fb28c2806a 100644 --- a/epan/dissectors/packet-wtls.c +++ b/epan/dissectors/packet-wtls.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" #ifdef DEBUG #include <stdio.h> diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c index a4498c9c0d..bec0e08ad9 100644 --- a/epan/dissectors/packet-wtp.c +++ b/epan/dissectors/packet-wtp.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" #ifdef DEBUG #include <stdio.h> diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index b88d0a9d65..a5c0d48d93 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -48,9 +48,7 @@ * http://tronche.com/gui/x/ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <assert.h> #include <string.h> diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c index 302eab34d6..076b9cf23e 100644 --- a/epan/dissectors/packet-x224.c +++ b/epan/dissectors/packet-x224.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/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 0fdf93fd02..aa0e454a60 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.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 <string.h> diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c index 6cac004eec..33d66ed7ed 100644 --- a/epan/dissectors/packet-x29.c +++ b/epan/dissectors/packet-x29.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/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index 8395102ca3..a13af01338 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -36,9 +36,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/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 6b70549ebf..171bc9a4a6 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -31,9 +31,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/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index 156c525806..e314b02e40 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -31,9 +31,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/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 3609782ca1..d5e4ba2254 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -31,9 +31,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/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index ef23b622b5..274b767eb2 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -31,9 +31,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/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c index d4554283ea..3217979450 100644 --- a/epan/dissectors/packet-xcsl.c +++ b/epan/dissectors/packet-xcsl.c @@ -26,9 +26,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> #include <string.h> diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index 4fc7a975de..fab360f05e 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.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 <ctype.h> diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 5a01606f6f..a7b2725e6a 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -30,9 +30,7 @@ * This dissector is capable of understanding XMCP versions 1.0 and 2.0. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index b7bef41548..bf8fd33a91 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.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 #ifdef HAVE_DIRENT_H #include <dirent.h> diff --git a/epan/dissectors/packet-xmpp-conference.c b/epan/dissectors/packet-xmpp-conference.c index 37908b8e41..edda0746b9 100644 --- a/epan/dissectors/packet-xmpp-conference.c +++ b/epan/dissectors/packet-xmpp-conference.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> diff --git a/epan/dissectors/packet-xmpp-core.c b/epan/dissectors/packet-xmpp-core.c index 70c3613d0e..099cc89e79 100644 --- a/epan/dissectors/packet-xmpp-core.c +++ b/epan/dissectors/packet-xmpp-core.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/epan/dissectors/packet-xmpp-gtalk.c b/epan/dissectors/packet-xmpp-gtalk.c index 7990ab947f..4e643af1eb 100644 --- a/epan/dissectors/packet-xmpp-gtalk.c +++ b/epan/dissectors/packet-xmpp-gtalk.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> diff --git a/epan/dissectors/packet-xmpp-jingle.c b/epan/dissectors/packet-xmpp-jingle.c index 6a5f12865f..fb2ba59707 100644 --- a/epan/dissectors/packet-xmpp-jingle.c +++ b/epan/dissectors/packet-xmpp-jingle.c @@ -39,9 +39,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/epan/dissectors/packet-xmpp-other.c b/epan/dissectors/packet-xmpp-other.c index 859a620ea8..c32a55ea13 100644 --- a/epan/dissectors/packet-xmpp-other.c +++ b/epan/dissectors/packet-xmpp-other.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 <string.h> diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index 14af0c5015..48584684b4 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/epan/dissectors/packet-xmpp-utils.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/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c index 41bdd2e980..bd74a05aa5 100644 --- a/epan/dissectors/packet-xmpp.c +++ b/epan/dissectors/packet-xmpp.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 <string.h> diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c index b82fd0e124..cd1e98dd6d 100644 --- a/epan/dissectors/packet-xot.c +++ b/epan/dissectors/packet-xot.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> diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c index 92c7a8e5d1..ce3eca0bd6 100644 --- a/epan/dissectors/packet-xtp.c +++ b/epan/dissectors/packet-xtp.c @@ -25,9 +25,7 @@ * Ref: http://www.packeteer.com/resources/prod-sol/XTP.pdf */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c index 73225532f5..584683ee76 100644 --- a/epan/dissectors/packet-xyplex.c +++ b/epan/dissectors/packet-xyplex.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/epan/dissectors/packet-yami.c b/epan/dissectors/packet-yami.c index b5168f17e0..1aa8538a36 100644 --- a/epan/dissectors/packet-yami.c +++ b/epan/dissectors/packet-yami.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 <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c index 4ebaec6cfa..658b2a8474 100644 --- a/epan/dissectors/packet-yhoo.c +++ b/epan/dissectors/packet-yhoo.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> diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index c43bcd3ea2..1a997f6c3b 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.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/epan/dissectors/packet-ypbind.c b/epan/dissectors/packet-ypbind.c index eea853eea2..e03a731be6 100644 --- a/epan/dissectors/packet-ypbind.c +++ b/epan/dissectors/packet-ypbind.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 diff --git a/epan/dissectors/packet-yppasswd.c b/epan/dissectors/packet-yppasswd.c index 1cd4391600..72329e8669 100644 --- a/epan/dissectors/packet-yppasswd.c +++ b/epan/dissectors/packet-yppasswd.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 diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c index b49a8070ce..ef80ca3637 100644 --- a/epan/dissectors/packet-ypserv.c +++ b/epan/dissectors/packet-ypserv.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 diff --git a/epan/dissectors/packet-ypxfr.c b/epan/dissectors/packet-ypxfr.c index 94a2efabb8..bfa0145da9 100644 --- a/epan/dissectors/packet-ypxfr.c +++ b/epan/dissectors/packet-ypxfr.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 diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index a37b6d04a3..2bb0c1549a 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -25,9 +25,7 @@ */ /* Include Files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVEHCONFIG_H */ #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 02ac7c1179..bc3a26be21 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -25,9 +25,7 @@ */ /* Include Files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVEHCONFIG_H */ #include <string.h> diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 55838ecb68..58d1ce4b72 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -25,9 +25,7 @@ */ /* Include Files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVEHCONFIG_H */ #include <string.h> diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index e738c5063d..cbe90d74df 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -28,9 +28,7 @@ */ /* Include Files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVEHCONFIG_H */ #include <string.h> #include <glib.h> diff --git a/epan/dissectors/packet-zbee-zdp-binding.c b/epan/dissectors/packet-zbee-zdp-binding.c index f716a30aa5..1802ec1565 100644 --- a/epan/dissectors/packet-zbee-zdp-binding.c +++ b/epan/dissectors/packet-zbee-zdp-binding.c @@ -25,9 +25,7 @@ */ /* Include Files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include <glib.h> diff --git a/epan/dissectors/packet-zbee-zdp-discovery.c b/epan/dissectors/packet-zbee-zdp-discovery.c index 4c93c6f49b..f77524f38f 100644 --- a/epan/dissectors/packet-zbee-zdp-discovery.c +++ b/epan/dissectors/packet-zbee-zdp-discovery.c @@ -25,9 +25,7 @@ */ /* Include Files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include <glib.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-zbee-zdp-management.c b/epan/dissectors/packet-zbee-zdp-management.c index 532c61393a..2e47024b7c 100644 --- a/epan/dissectors/packet-zbee-zdp-management.c +++ b/epan/dissectors/packet-zbee-zdp-management.c @@ -25,9 +25,7 @@ */ /* Include Files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include <glib.h> diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index b6d12b81a3..2b95d3c03d 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -25,9 +25,7 @@ */ /* Include Files */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include <glib.h> diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index c3f33b8d7a..e1364be181 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.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 <string.h> #include <ctype.h> diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c index 0cb2240ba3..507528c289 100644 --- a/epan/dissectors/packet-zep.c +++ b/epan/dissectors/packet-zep.c @@ -43,9 +43,7 @@ *------------------------------------------------------------ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVEHCONFIG_H */ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c index a7673c478e..4d3973af02 100644 --- a/epan/dissectors/packet-ziop.c +++ b/epan/dissectors/packet-ziop.c @@ -29,9 +29,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c index d6dafe8fcf..059f6237c9 100644 --- a/epan/dissectors/packet-zrtp.c +++ b/epan/dissectors/packet-zrtp.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 <string.h> #include <glib.h> |