diff options
311 files changed, 219 insertions, 841 deletions
diff --git a/epan/addr_and_mask.c b/epan/addr_and_mask.c index c6f9319aa2..854a96891f 100644 --- a/epan/addr_and_mask.c +++ b/epan/addr_and_mask.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> #include <string.h> diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index fa0c738728..4d65a50cda 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.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 <stdio.h> diff --git a/epan/address_to_str.c b/epan/address_to_str.c index ba3b25388c..298287d635 100644 --- a/epan/address_to_str.c +++ b/epan/address_to_str.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 <stdlib.h> #include <string.h> diff --git a/epan/afn.c b/epan/afn.c index ddaee9b0b6..85d136e2d9 100644 --- a/epan/afn.c +++ b/epan/afn.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/afn.h> diff --git a/epan/asm_utils.c b/epan/asm_utils.c index df18b08552..7eef29e4ba 100644 --- a/epan/asm_utils.c +++ b/epan/asm_utils.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <ctype.h> diff --git a/epan/asn1.c b/epan/asn1.c index b64bf0573c..048a3b068a 100644 --- a/epan/asn1.c +++ b/epan/asn1.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/atalk-utils.c b/epan/atalk-utils.c index 3f67c583d3..a51f9e11c4 100644 --- a/epan/atalk-utils.c +++ b/epan/atalk-utils.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "atalk-utils.h" #include "emem.h" diff --git a/epan/base64.c b/epan/base64.c index 343c75dec5..aeba7c1d8a 100644 --- a/epan/base64.c +++ b/epan/base64.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 "base64.h" diff --git a/epan/bitswap.c b/epan/bitswap.c index 9ebcdca9bd..f70620cbb2 100644 --- a/epan/bitswap.c +++ b/epan/bitswap.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/camel-persistentdata.c b/epan/camel-persistentdata.c index 7b94e8088f..74e1f418a6 100644 --- a/epan/camel-persistentdata.c +++ b/epan/camel-persistentdata.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 <stdio.h> diff --git a/epan/charsets.c b/epan/charsets.c index 12f20ebd90..1c5b79ac4b 100644 --- a/epan/charsets.c +++ b/epan/charsets.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/circuit.c b/epan/circuit.c index da62864fea..daf6423685 100644 --- a/epan/circuit.c +++ b/epan/circuit.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 "packet.h" diff --git a/epan/codecs.c b/epan/codecs.c index 304bfe96a4..5908ea2fb1 100644 --- a/epan/codecs.c +++ b/epan/codecs.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/codecs.h> diff --git a/epan/column-utils.c b/epan/column-utils.c index 7ea52e136a..a26950c4df 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <time.h> diff --git a/epan/column.c b/epan/column.c index 05e8f543a3..231f1c5459 100644 --- a/epan/column.c +++ b/epan/column.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/conversation.c b/epan/conversation.c index b30db3f0b8..0ceeda483e 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/epan/crc16-tvb.c b/epan/crc16-tvb.c index b90ea83922..ea86e4b12a 100644 --- a/epan/crc16-tvb.c +++ b/epan/crc16-tvb.c @@ -31,9 +31,7 @@ * DCEs using asynchronous-to-synchronous conversion", Para. 8.1.1.6.1 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/tvbuff.h> diff --git a/epan/crc32-tvb.c b/epan/crc32-tvb.c index 3153f854e5..ce7bd79b21 100644 --- a/epan/crc32-tvb.c +++ b/epan/crc32-tvb.c @@ -27,9 +27,7 @@ * Routine from Chris Waters */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/tvbuff.h> diff --git a/epan/crc8-tvb.c b/epan/crc8-tvb.c index c2a74cd4f0..6832728187 100644 --- a/epan/crc8-tvb.c +++ b/epan/crc8-tvb.c @@ -32,9 +32,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/tvbuff.h> diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c index 4f709aa0d5..b42f36d7a9 100644 --- a/epan/crypt/airpdcap.c +++ b/epan/crypt/airpdcap.c @@ -36,9 +36,7 @@ /****************************************************************************/ /* File includes */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/tvbuff.h> #include <wsutil/crc32.h> diff --git a/epan/crypt/des.c b/epan/crypt/des.c index 9edafb9a5b..e729b1f210 100644 --- a/epan/crypt/des.c +++ b/epan/crypt/des.c @@ -23,9 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <epan/crypt/des.h> diff --git a/epan/crypt/eax.c b/epan/crypt/eax.c index 3558dce79b..8ded6f2be6 100644 --- a/epan/crypt/eax.c +++ b/epan/crypt/eax.c @@ -22,9 +22,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 <stdlib.h> #ifdef HAVE_LIBGCRYPT #include <string.h> diff --git a/epan/crypt/eax.h b/epan/crypt/eax.h index 8209d4d60b..46554f6d94 100644 --- a/epan/crypt/eax.h +++ b/epan/crypt/eax.h @@ -22,9 +22,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> typedef struct tagMAC_T diff --git a/epan/crypt/md4.c b/epan/crypt/md4.c index fd9d690f48..fc495dd3a4 100644 --- a/epan/crypt/md4.c +++ b/epan/crypt/md4.c @@ -20,9 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <string.h> diff --git a/epan/crypt/md5.c b/epan/crypt/md5.c index d7a933bb13..916b19e316 100644 --- a/epan/crypt/md5.c +++ b/epan/crypt/md5.c @@ -26,9 +26,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <string.h> diff --git a/epan/crypt/rc4.c b/epan/crypt/rc4.c index a53fa351f8..d99cc1a85e 100644 --- a/epan/crypt/rc4.c +++ b/epan/crypt/rc4.c @@ -23,9 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <string.h> diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c index 78a9ad3e87..b3f04df317 100644 --- a/epan/dfilter/dfilter-macro.c +++ b/epan/dfilter/dfilter-macro.c @@ -22,9 +22,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <errno.h> diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c index 60ceef288d..ea48ce8cad 100644 --- a/epan/dfilter/dfilter.c +++ b/epan/dfilter/dfilter.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <string.h> diff --git a/epan/dfilter/dfunctions.c b/epan/dfilter/dfunctions.c index f3edfafed4..816cd2abc3 100644 --- a/epan/dfilter/dfunctions.c +++ b/epan/dfilter/dfunctions.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c index ae85be565a..50c5ce139e 100644 --- a/epan/dfilter/dfvm.c +++ b/epan/dfilter/dfvm.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "dfvm.h" diff --git a/epan/dfilter/drange.c b/epan/dfilter/drange.c index 0a60529328..b4afa15a96 100644 --- a/epan/dfilter/drange.c +++ b/epan/dfilter/drange.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 "drange.h" diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c index 81469e8ba8..81e2c2369a 100644 --- a/epan/dfilter/gencode.c +++ b/epan/dfilter/gencode.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "dfilter-int.h" #include "gencode.h" diff --git a/epan/dfilter/grammar.lemon b/epan/dfilter/grammar.lemon index a58b75406a..46c3d3ae7a 100644 --- a/epan/dfilter/grammar.lemon +++ b/epan/dfilter/grammar.lemon @@ -1,9 +1,7 @@ /* $Id$ */ %include { -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "dfilter-int.h" #include "syntax-tree.h" diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l index 88cb402565..ca7c3ae58a 100644 --- a/epan/dfilter/scanner.l +++ b/epan/dfilter/scanner.l @@ -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 <stdlib.h> #include <errno.h> diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c index 3db5873c13..5259f10cbb 100644 --- a/epan/dfilter/semcheck.c +++ b/epan/dfilter/semcheck.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/epan/dfilter/sttype-function.c b/epan/dfilter/sttype-function.c index f91fa79c06..bcfa9b53f8 100644 --- a/epan/dfilter/sttype-function.c +++ b/epan/dfilter/sttype-function.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "syntax-tree.h" #include "sttype-function.h" diff --git a/epan/dfilter/sttype-integer.c b/epan/dfilter/sttype-integer.c index 13157f418c..bc6b946c88 100644 --- a/epan/dfilter/sttype-integer.c +++ b/epan/dfilter/sttype-integer.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 "ftypes/ftypes.h" #include "syntax-tree.h" diff --git a/epan/dfilter/sttype-pointer.c b/epan/dfilter/sttype-pointer.c index 62573adaad..3da0e6b040 100644 --- a/epan/dfilter/sttype-pointer.c +++ b/epan/dfilter/sttype-pointer.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 "ftypes/ftypes.h" #include "syntax-tree.h" diff --git a/epan/dfilter/sttype-range.c b/epan/dfilter/sttype-range.c index 23dff6f80d..92ed7e4f7a 100644 --- a/epan/dfilter/sttype-range.c +++ b/epan/dfilter/sttype-range.c @@ -25,9 +25,7 @@ * The code is different, but definitely inspired by his code. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> diff --git a/epan/dfilter/syntax-tree.c b/epan/dfilter/syntax-tree.c index fa831c2454..14318149f0 100644 --- a/epan/dfilter/syntax-tree.c +++ b/epan/dfilter/syntax-tree.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "syntax-tree.h" diff --git a/epan/diam_dict.l b/epan/diam_dict.l index 6cd783c4bb..b2773da87b 100644 --- a/epan/diam_dict.l +++ b/epan/diam_dict.l @@ -46,9 +46,7 @@ ** Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <stdio.h> diff --git a/epan/dissector_filters.c b/epan/dissector_filters.c index 22be2a8b2d..fd29fc5d0a 100644 --- a/epan/dissector_filters.c +++ b/epan/dissector_filters.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 "packet.h" diff --git a/epan/dtd_grammar.lemon b/epan/dtd_grammar.lemon index 2fcdd6de55..704a1f53b3 100644 --- a/epan/dtd_grammar.lemon +++ b/epan/dtd_grammar.lemon @@ -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 <stdio.h> #include <glib.h> diff --git a/epan/dtd_preparse.l b/epan/dtd_preparse.l index 2857296e6f..97e96a9b9e 100644 --- a/epan/dtd_preparse.l +++ b/epan/dtd_preparse.l @@ -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> #include <string.h> diff --git a/epan/emem.c b/epan/emem.c index fc81db17ed..f1060b6394 100644 --- a/epan/emem.c +++ b/epan/emem.c @@ -22,9 +22,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 <stdio.h> #include <stdlib.h> diff --git a/epan/epan.c b/epan/epan.c index 098487884b..ffbc537974 100644 --- a/epan/epan.c +++ b/epan/epan.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 #ifdef HAVE_PYTHON #include <Python.h> /* to get the Python version number (PY_VERSION) */ diff --git a/epan/ex-opt.c b/epan/ex-opt.c index 8ca0ee1629..6a1a85cd60 100644 --- a/epan/ex-opt.c +++ b/epan/ex-opt.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 "ex-opt.h" diff --git a/epan/except.c b/epan/except.c index 8930c96dc9..cb6316d8d4 100644 --- a/epan/except.c +++ b/epan/except.c @@ -26,9 +26,7 @@ * not freeing that). */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <assert.h> #include <stdlib.h> diff --git a/epan/expert.c b/epan/expert.c index 21cef79a62..2d9ee5e22f 100644 --- a/epan/expert.c +++ b/epan/expert.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.h" #include "expert.h" diff --git a/epan/filesystem.c b/epan/filesystem.c index 6cfdd5441d..fbb7bd0c24 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.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" /* * Required with GNU libc to get dladdr(). diff --git a/epan/filter_expressions.c b/epan/filter_expressions.c index 067a957017..9bd0e54025 100644 --- a/epan/filter_expressions.c +++ b/epan/filter_expressions.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 <stdlib.h> #include <glib.h> diff --git a/epan/follow.c b/epan/follow.c index fe56ba4adf..c27ba5afc9 100644 --- a/epan/follow.c +++ b/epan/follow.c @@ -24,9 +24,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdlib.h> #include <stdio.h> diff --git a/epan/frame_data.c b/epan/frame_data.c index ee3a08e37f..922a655d70 100644 --- a/epan/frame_data.c +++ b/epan/frame_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 <wiretap/wtap.h> #include <epan/frame_data.h> diff --git a/epan/frequency-utils.c b/epan/frequency-utils.c index eed8e5ff29..3cd27e3a52 100644 --- a/epan/frequency-utils.c +++ b/epan/frequency-utils.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c index 4f5ab8ea3b..575f6b7038 100644 --- a/epan/ftypes/ftype-bytes.c +++ b/epan/ftypes/ftype-bytes.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <ftypes-int.h> diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c index 5506d57214..0e6564e08c 100644 --- a/epan/ftypes/ftype-double.c +++ b/epan/ftypes/ftype-double.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <ftypes-int.h> diff --git a/epan/ftypes/ftype-guid.c b/epan/ftypes/ftype-guid.c index 6665a03b3b..e46a8a6d40 100644 --- a/epan/ftypes/ftype-guid.c +++ b/epan/ftypes/ftype-guid.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> #include <ctype.h> diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c index 2935b2c8b7..4a05c7600a 100644 --- a/epan/ftypes/ftype-integer.c +++ b/epan/ftypes/ftype-integer.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <errno.h> diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c index 8a30e4e7c4..4b7251a93a 100644 --- a/epan/ftypes/ftype-ipv4.c +++ b/epan/ftypes/ftype-ipv4.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/epan/ftypes/ftype-ipv6.c b/epan/ftypes/ftype-ipv6.c index 225d32b65d..3b45e1aae7 100644 --- a/epan/ftypes/ftype-ipv6.c +++ b/epan/ftypes/ftype-ipv6.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/epan/ftypes/ftype-none.c b/epan/ftypes/ftype-none.c index 8454c0491c..956d7e9259 100644 --- a/epan/ftypes/ftype-none.c +++ b/epan/ftypes/ftype-none.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <ftypes-int.h> diff --git a/epan/ftypes/ftype-pcre.c b/epan/ftypes/ftype-pcre.c index d770f453ab..4503b4459a 100644 --- a/epan/ftypes/ftype-pcre.c +++ b/epan/ftypes/ftype-pcre.c @@ -25,9 +25,7 @@ * compilation and studying of a PCRE pattern in dfilters. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <ftypes-int.h> diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c index 3a46f1c4a8..1ecea3bf09 100644 --- a/epan/ftypes/ftype-string.c +++ b/epan/ftypes/ftype-string.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <ftypes-int.h> diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c index 8601115a7d..b04229807e 100644 --- a/epan/ftypes/ftype-time.c +++ b/epan/ftypes/ftype-time.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <ctype.h> diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c index 36db056733..eae3f3b59c 100644 --- a/epan/ftypes/ftype-tvbuff.c +++ b/epan/ftypes/ftype-tvbuff.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <ftypes-int.h> diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c index cc301a7b7c..7451d2af1c 100644 --- a/epan/ftypes/ftypes.c +++ b/epan/ftypes/ftypes.c @@ -20,9 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <ftypes-int.h> #include <glib.h> diff --git a/epan/funnel.c b/epan/funnel.c index 2130b41074..da768cb3ab 100644 --- a/epan/funnel.c +++ b/epan/funnel.c @@ -26,9 +26,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <epan/funnel.h> diff --git a/epan/gcp.c b/epan/gcp.c index 0a8f2efce9..67a066ed11 100644 --- a/epan/gcp.c +++ b/epan/gcp.c @@ -29,9 +29,7 @@ * - avoid persistent tracking of NULL and ALL contexts */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "gcp.h" diff --git a/epan/geoip_db.c b/epan/geoip_db.c index ab723af889..f70ba182e3 100644 --- a/epan/geoip_db.c +++ b/epan/geoip_db.c @@ -29,9 +29,7 @@ * e.g. GeoIPCity, can return other info such as area codes. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/guid-utils.c b/epan/guid-utils.c index d19ea3cff5..c3305208c2 100644 --- a/epan/guid-utils.c +++ b/epan/guid-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 <string.h> diff --git a/epan/h225-persistentdata.c b/epan/h225-persistentdata.c index b33d46a763..8a24fd4eaf 100644 --- a/epan/h225-persistentdata.c +++ b/epan/h225-persistentdata.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/in_cksum.c b/epan/in_cksum.c index 3683a321b8..e14c1aca05 100644 --- a/epan/in_cksum.c +++ b/epan/in_cksum.c @@ -37,9 +37,7 @@ * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> diff --git a/epan/ipproto.c b/epan/ipproto.c index d5b04f0f85..2089e5793c 100644 --- a/epan/ipproto.c +++ b/epan/ipproto.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_NETDB_H # include <netdb.h> diff --git a/epan/ipv4.c b/epan/ipv4.c index 520e32f7a7..f220cfacef 100644 --- a/epan/ipv4.c +++ b/epan/ipv4.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 <stdio.h> diff --git a/epan/next_tvb.c b/epan/next_tvb.c index d245d2bd32..cbdd91554c 100644 --- a/epan/next_tvb.c +++ b/epan/next_tvb.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/oids.c b/epan/oids.c index e15717f467..89d25c75a7 100644 --- a/epan/oids.c +++ b/epan/oids.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 <stdio.h> diff --git a/epan/osi-utils.c b/epan/osi-utils.c index e691fc187a..a71e13fbbe 100644 --- a/epan/osi-utils.c +++ b/epan/osi-utils.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/epan/packet.c b/epan/packet.c index 85d7768694..ba8bfd364b 100644 --- a/epan/packet.c +++ b/epan/packet.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/plugins.c b/epan/plugins.c index d7695cc839..57c8ea2d0c 100644 --- a/epan/plugins.c +++ b/epan/plugins.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 "plugins.h" #include <stdio.h> diff --git a/epan/prefs.c b/epan/prefs.c index f339a2b446..0557afd10e 100644 --- a/epan/prefs.c +++ b/epan/prefs.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 <stdlib.h> #include <string.h> diff --git a/epan/proto.c b/epan/proto.c index 511c6d9dd0..e122beaefb 100644 --- a/epan/proto.c +++ b/epan/proto.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/radius_dict.l b/epan/radius_dict.l index 6da8cb778c..65303df91f 100644 --- a/epan/radius_dict.l +++ b/epan/radius_dict.l @@ -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 <glib.h> #include <stdio.h> diff --git a/epan/range.c b/epan/range.c index b51c36c037..5db6cd45c6 100644 --- a/epan/range.c +++ b/epan/range.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> #include <ctype.h> diff --git a/epan/reassemble.c b/epan/reassemble.c index 5ef746dcb0..56da9714c6 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.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> diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c index 79e6591f79..3fdd9e2b47 100644 --- a/epan/reassemble_test.c +++ b/epan/reassemble_test.c @@ -58,9 +58,7 @@ #include <glib.h> -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <epan/emem.h> #include <epan/packet.h> diff --git a/epan/report_err.c b/epan/report_err.c index 9a7144968c..e470af903c 100644 --- a/epan/report_err.c +++ b/epan/report_err.c @@ -29,9 +29,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> #include <stdarg.h> diff --git a/epan/req_resp_hdrs.c b/epan/req_resp_hdrs.c index 5a7a78aca2..b7af5bd7e1 100644 --- a/epan/req_resp_hdrs.c +++ b/epan/req_resp_hdrs.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 <stdio.h> diff --git a/epan/sigcomp-udvm.c b/epan/sigcomp-udvm.c index e136bc7960..d4fbe8f2af 100644 --- a/epan/sigcomp-udvm.c +++ b/epan/sigcomp-udvm.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 <stdio.h> #include <stdlib.h> diff --git a/epan/sigcomp_state_hdlr.c b/epan/sigcomp_state_hdlr.c index d9339af7d6..612b5de6b9 100644 --- a/epan/sigcomp_state_hdlr.c +++ b/epan/sigcomp_state_hdlr.c @@ -34,9 +34,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 <stdio.h> #include <stdlib.h> diff --git a/epan/sna-utils.c b/epan/sna-utils.c index 656762425f..c962285998 100644 --- a/epan/sna-utils.c +++ b/epan/sna-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" #include <string.h> diff --git a/epan/stat_cmd_args.c b/epan/stat_cmd_args.c index 89592424dd..5b7519ee50 100644 --- a/epan/stat_cmd_args.c +++ b/epan/stat_cmd_args.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/epan/stats_tree.c b/epan/stats_tree.c index 799bcdb88a..77eacf64ab 100644 --- a/epan/stats_tree.c +++ b/epan/stats_tree.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <glib.h> #include <epan/stats_tree_priv.h> diff --git a/epan/stream.c b/epan/stream.c index fb708fe3f0..1784c7d312 100644 --- a/epan/stream.c +++ b/epan/stream.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/strutil.c b/epan/strutil.c index b9e3a39526..fa6b6aa0e4 100644 --- a/epan/strutil.c +++ b/epan/strutil.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 <stdlib.h> #include <string.h> diff --git a/epan/tap.c b/epan/tap.c index 601e3a2ceb..88b4236522 100644 --- a/epan/tap.c +++ b/epan/tap.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/epan/tcap-persistentdata.c b/epan/tcap-persistentdata.c index 35736ecc9b..d886869a5b 100644 --- a/epan/tcap-persistentdata.c +++ b/epan/tcap-persistentdata.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/tfs.c b/epan/tfs.c index 0b720b3df7..772d80f662 100644 --- a/epan/tfs.c +++ b/epan/tfs.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 "tfs.h" diff --git a/epan/timestamp.c b/epan/timestamp.c index 52cec49644..155d8bb92f 100644 --- a/epan/timestamp.c +++ b/epan/timestamp.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 "timestamp.h" diff --git a/epan/to_str.c b/epan/to_str.c index cda834f11c..f0e47b4dbe 100644 --- a/epan/to_str.c +++ b/epan/to_str.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/tpg.c b/epan/tpg.c index e430b933d1..4c6f26858a 100644 --- a/epan/tpg.c +++ b/epan/tpg.c @@ -25,9 +25,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "tpg.h" #include <epan/emem.h> diff --git a/epan/tvbparse.c b/epan/tvbparse.c index 42322d435a..e6f128d03e 100644 --- a/epan/tvbparse.c +++ b/epan/tvbparse.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <string.h> diff --git a/epan/tvbtest.c b/epan/tvbtest.c index e919ebd993..9f4879bd39 100644 --- a/epan/tvbtest.c +++ b/epan/tvbtest.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 33a2e8e192..f6056a3002 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.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/uat.c b/epan/uat.c index 2ecef502a0..9c9ff8ba53 100644 --- a/epan/uat.c +++ b/epan/uat.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 <stdlib.h> #include <stdio.h> diff --git a/epan/uat_load.l b/epan/uat_load.l index f4ed7790f3..c6052e240c 100644 --- a/epan/uat_load.l +++ b/epan/uat_load.l @@ -44,9 +44,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 <stdlib.h> #include <stdio.h> diff --git a/epan/value_string.c b/epan/value_string.c index f48b3155ff..f241c91cee 100644 --- a/epan/value_string.c +++ b/epan/value_string.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c index 6337af9a91..10be91f465 100644 --- a/epan/wslua/init_wslua.c +++ b/epan/wslua/init_wslua.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 "wslua.h" #include <epan/dissectors/packet-frame.h> diff --git a/epan/wslua/make-reg.pl b/epan/wslua/make-reg.pl index 06c83f356d..d693e8a57d 100755 --- a/epan/wslua/make-reg.pl +++ b/epan/wslua/make-reg.pl @@ -56,9 +56,7 @@ print H "extern void wslua_register_classes(lua_State* L);\n"; print H "extern void wslua_register_functions(lua_State* L);\n"; print H "\n\n"; -print C "#ifdef HAVE_CONFIG_H\n"; print C '#include "config.h"' . "\n"; -print C "#endif\n\n"; print C '#include "wslua.h"' . "\n\n"; print C "void wslua_register_classes(lua_State* L) { \n"; diff --git a/epan/wslua/make-taps.pl b/epan/wslua/make-taps.pl index 8fefeae637..64c3aac6b6 100755 --- a/epan/wslua/make-taps.pl +++ b/epan/wslua/make-taps.pl @@ -155,9 +155,7 @@ print CFILE <<"HEADER"; /* This file is autogenerated from ./taps by ./make-taps.pl */ /* DO NOT EDIT! */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "wslua.h" diff --git a/epan/wslua/wslua_dumper.c b/epan/wslua/wslua_dumper.c index 786d247226..cfaa0142bd 100644 --- a/epan/wslua/wslua_dumper.c +++ b/epan/wslua/wslua_dumper.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 /* WSLUA_MODULE Dumper Saving capture files */ diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c index b1927e22e7..3981232fa2 100644 --- a/epan/wslua/wslua_field.c +++ b/epan/wslua/wslua_field.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 /* WSLUA_MODULE Field Obtaining dissection data */ diff --git a/epan/wslua/wslua_gui.c b/epan/wslua/wslua_gui.c index 0c6888f5a1..e19ce866b8 100644 --- a/epan/wslua/wslua_gui.c +++ b/epan/wslua/wslua_gui.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 "wslua.h" diff --git a/epan/wslua/wslua_listener.c b/epan/wslua/wslua_listener.c index 59bdb371e0..6361c74cc9 100644 --- a/epan/wslua/wslua_listener.c +++ b/epan/wslua/wslua_listener.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 /* WSLUA_MODULE Listener Post-dissection packet analysis */ diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index 2a1fa52e3c..c101dcb95f 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.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 /* WSLUA_MODULE Pinfo Obtaining packet information */ diff --git a/epan/wslua/wslua_proto.c b/epan/wslua/wslua_proto.c index db1c3a92a0..a04afae4aa 100644 --- a/epan/wslua/wslua_proto.c +++ b/epan/wslua/wslua_proto.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 /* WSLUA_MODULE Proto Functions for writing dissectors */ diff --git a/epan/wslua/wslua_tree.c b/epan/wslua/wslua_tree.c index 1ceaaa6b21..9feffdd48f 100644 --- a/epan/wslua/wslua_tree.c +++ b/epan/wslua/wslua_tree.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 /* WSLUA_MODULE Tree Adding information to the dissection tree */ diff --git a/epan/wslua/wslua_tvb.c b/epan/wslua/wslua_tvb.c index 104df2a999..57c0e91f67 100644 --- a/epan/wslua/wslua_tvb.c +++ b/epan/wslua/wslua_tvb.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 /* WSLUA_MODULE Tvb Functions for handling packet data */ diff --git a/epan/wslua/wslua_util.c b/epan/wslua/wslua_util.c index b48c270c37..0b0bcdf266 100644 --- a/epan/wslua/wslua_util.c +++ b/epan/wslua/wslua_util.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 /* WSLUA_MODULE Utility Utility Functions */ diff --git a/epan/wspython/wspy_proto.c b/epan/wspython/wspy_proto.c index cbecfa65df..10f7c07009 100644 --- a/epan/wspython/wspy_proto.c +++ b/epan/wspython/wspy_proto.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_PYTHON #include <Python.h> diff --git a/epan/wspython/wspy_register.c b/epan/wspython/wspy_register.c index 9948ef74b9..30fdf33891 100644 --- a/epan/wspython/wspy_register.c +++ b/epan/wspython/wspy_register.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_PYTHON #include <Python.h> diff --git a/epan/xdlc.c b/epan/xdlc.c index 827984995f..9ca6c4db94 100644 --- a/epan/xdlc.c +++ b/epan/xdlc.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/ui/alert_box.c b/ui/alert_box.c index e4229845c9..4e5e5eab3d 100644 --- a/ui/alert_box.c +++ b/ui/alert_box.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/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index 453beac8a0..fa7b0cb7bb 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.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 <gtk/gtk.h> diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c index eeaf3494dc..25625004f2 100644 --- a/ui/gtk/afp_stat.c +++ b/ui/gtk/afp_stat.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/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c index 9b749daee5..221b08e11c 100644 --- a/ui/gtk/airpcap_dlg.c +++ b/ui/gtk/airpcap_dlg.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_AIRPCAP diff --git a/ui/gtk/airpcap_gui_utils.c b/ui/gtk/airpcap_gui_utils.c index 9cb396495e..8b10adf949 100644 --- a/ui/gtk/airpcap_gui_utils.c +++ b/ui/gtk/airpcap_gui_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 "config.h" #ifdef HAVE_AIRPCAP diff --git a/ui/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c index b46a00fcd6..d75bbb763d 100644 --- a/ui/gtk/ansi_a_stat.c +++ b/ui/gtk/ansi_a_stat.c @@ -30,9 +30,7 @@ * This TAP provides statistics for the ANSI A-Interface: */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gtk/gtk.h> #include <string.h> diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c index 1559550134..b5fc741a1f 100644 --- a/ui/gtk/ansi_map_stat.c +++ b/ui/gtk/ansi_map_stat.c @@ -30,9 +30,7 @@ * This TAP provides statistics for ANSI MAP: */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gtk/gtk.h> #include <string.h> diff --git a/ui/gtk/bootp_stat.c b/ui/gtk/bootp_stat.c index 0810778f8d..6698481d83 100644 --- a/ui/gtk/bootp_stat.c +++ b/ui/gtk/bootp_stat.c @@ -23,9 +23,7 @@ */ /* #define DEBUG do{ printf("%s:%d ",__FILE__,__LINE__);} while(0); */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gtk/gtk.h> #include <string.h> diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c index 7c4679ce9a..693dbb393f 100644 --- a/ui/gtk/bytes_view.c +++ b/ui/gtk/bytes_view.c @@ -29,9 +29,7 @@ * pango-layout.c: High-level layout driver. Copyright (C) 2000, 2001, 2006 Red Hat Software */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <gtk/gtk.h> #include "ui/gtk/old-gtk-compat.h" diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c index 21b69410d1..8f5002c9e4 100644 --- a/ui/gtk/camel_counter.c +++ b/ui/gtk/camel_counter.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/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c index c0dcdcea39..60c9a4ca35 100644 --- a/ui/gtk/camel_srt.c +++ b/ui/gtk/camel_srt.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 <gtk/gtk.h> diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index 5c0d536d5a..fe8b82a18a 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.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_LIBPCAP diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index 2048eccb23..6a96efbd2f 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c index 5c14b191a7..533d20840f 100644 --- a/ui/gtk/capture_if_details_dlg_win32.c +++ b/ui/gtk/capture_if_details_dlg_win32.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #if defined HAVE_LIBPCAP && defined _WIN32 diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index afbf787968..8afdd60bcb 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.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 <gtk/gtk.h> diff --git a/ui/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c index 2978b84ff9..6de4d26888 100644 --- a/ui/gtk/capture_info_dlg.c +++ b/ui/gtk/capture_info_dlg.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_LIBPCAP diff --git a/ui/gtk/cfilter_combo_utils.c b/ui/gtk/cfilter_combo_utils.c index 1101cbb89b..39cdda78ed 100644 --- a/ui/gtk/cfilter_combo_utils.c +++ b/ui/gtk/cfilter_combo_utils.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <string.h> diff --git a/ui/gtk/color_dlg.c b/ui/gtk/color_dlg.c index fd6749afac..c3be90e4a4 100644 --- a/ui/gtk/color_dlg.c +++ b/ui/gtk/color_dlg.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> diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c index b46f8c0aac..92ff458840 100644 --- a/ui/gtk/color_edit_dlg.c +++ b/ui/gtk/color_edit_dlg.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> diff --git a/ui/gtk/color_utils.c b/ui/gtk/color_utils.c index 99a085b4c5..dcc8813b8d 100644 --- a/ui/gtk/color_utils.c +++ b/ui/gtk/color_utils.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index 2016d1aef2..5b3683dfe2 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -32,9 +32,7 @@ * The packets are compared by the ip id. MAC or TTL is used to distinct the different files. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/gtk/conversations_eth.c b/ui/gtk/conversations_eth.c index b62eab8147..6181b3bf35 100644 --- a/ui/gtk/conversations_eth.c +++ b/ui/gtk/conversations_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 <string.h> diff --git a/ui/gtk/conversations_fc.c b/ui/gtk/conversations_fc.c index 63e16c16d2..b455538c5d 100644 --- a/ui/gtk/conversations_fc.c +++ b/ui/gtk/conversations_fc.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> diff --git a/ui/gtk/conversations_fddi.c b/ui/gtk/conversations_fddi.c index 2360dfad23..85b9de3926 100644 --- a/ui/gtk/conversations_fddi.c +++ b/ui/gtk/conversations_fddi.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> diff --git a/ui/gtk/conversations_ip.c b/ui/gtk/conversations_ip.c index 4ebc7dc43d..19ac825cb8 100644 --- a/ui/gtk/conversations_ip.c +++ b/ui/gtk/conversations_ip.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> diff --git a/ui/gtk/conversations_ipv6.c b/ui/gtk/conversations_ipv6.c index 43922e7b96..02b44a5d3e 100644 --- a/ui/gtk/conversations_ipv6.c +++ b/ui/gtk/conversations_ipv6.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> diff --git a/ui/gtk/conversations_ipx.c b/ui/gtk/conversations_ipx.c index 41d5307b1c..87300ffc2b 100644 --- a/ui/gtk/conversations_ipx.c +++ b/ui/gtk/conversations_ipx.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> diff --git a/ui/gtk/conversations_jxta.c b/ui/gtk/conversations_jxta.c index f466a120d2..a0c7759fbb 100644 --- a/ui/gtk/conversations_jxta.c +++ b/ui/gtk/conversations_jxta.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/ui/gtk/conversations_ncp.c b/ui/gtk/conversations_ncp.c index 755bd80b7f..5554652a35 100644 --- a/ui/gtk/conversations_ncp.c +++ b/ui/gtk/conversations_ncp.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> diff --git a/ui/gtk/conversations_rsvp.c b/ui/gtk/conversations_rsvp.c index 54719c8128..b8684d964d 100644 --- a/ui/gtk/conversations_rsvp.c +++ b/ui/gtk/conversations_rsvp.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> diff --git a/ui/gtk/conversations_sctp.c b/ui/gtk/conversations_sctp.c index eed79db713..067ff38f93 100644 --- a/ui/gtk/conversations_sctp.c +++ b/ui/gtk/conversations_sctp.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> diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index 10231a63ba..1f3e40b8cf 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.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 <locale.h> diff --git a/ui/gtk/conversations_tcpip.c b/ui/gtk/conversations_tcpip.c index 5232337d3d..a8c25ce0ef 100644 --- a/ui/gtk/conversations_tcpip.c +++ b/ui/gtk/conversations_tcpip.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> diff --git a/ui/gtk/conversations_tr.c b/ui/gtk/conversations_tr.c index 07aef7ce19..9559424338 100644 --- a/ui/gtk/conversations_tr.c +++ b/ui/gtk/conversations_tr.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> diff --git a/ui/gtk/conversations_udpip.c b/ui/gtk/conversations_udpip.c index dc268f85eb..037f967baa 100644 --- a/ui/gtk/conversations_udpip.c +++ b/ui/gtk/conversations_udpip.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> diff --git a/ui/gtk/conversations_usb.c b/ui/gtk/conversations_usb.c index 5fe243a440..4d21ecee9f 100644 --- a/ui/gtk/conversations_usb.c +++ b/ui/gtk/conversations_usb.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> diff --git a/ui/gtk/conversations_wlan.c b/ui/gtk/conversations_wlan.c index 03f884b4f3..84856dbc92 100644 --- a/ui/gtk/conversations_wlan.c +++ b/ui/gtk/conversations_wlan.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> diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c index 7588700567..00825ca06f 100644 --- a/ui/gtk/dcerpc_stat.c +++ b/ui/gtk/dcerpc_stat.c @@ -29,9 +29,7 @@ * It serves as an example on how to use the tap api. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/gtk/decode_as_ber.c b/ui/gtk/decode_as_ber.c index 3c97a52f37..8cf86aef2c 100644 --- a/ui/gtk/decode_as_ber.c +++ b/ui/gtk/decode_as_ber.c @@ -21,9 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <gtk/gtk.h> diff --git a/ui/gtk/decode_as_dcerpc.c b/ui/gtk/decode_as_dcerpc.c index 41e16486c4..09d68ba098 100644 --- a/ui/gtk/decode_as_dcerpc.c +++ b/ui/gtk/decode_as_dcerpc.c @@ -21,9 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <gtk/gtk.h> diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index ca9004dcf3..b79435b1c6 100644 --- a/ui/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.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 <gtk/gtk.h> diff --git a/ui/gtk/dfilter_expr_dlg.c b/ui/gtk/dfilter_expr_dlg.c index f6c508384d..09bef51c31 100644 --- a/ui/gtk/dfilter_expr_dlg.c +++ b/ui/gtk/dfilter_expr_dlg.c @@ -39,9 +39,7 @@ * Sort the protocols and children */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <ctype.h> #include <string.h> diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c index 7bc0aafd5f..57e3775da0 100644 --- a/ui/gtk/diameter_stat.c +++ b/ui/gtk/diameter_stat.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/ui/gtk/dissector_tables_dlg.c b/ui/gtk/dissector_tables_dlg.c index d2dbaa23f1..63001b0395 100644 --- a/ui/gtk/dissector_tables_dlg.c +++ b/ui/gtk/dissector_tables_dlg.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> diff --git a/ui/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c index 4bfde0e235..5e074b3aaf 100644 --- a/ui/gtk/dlg_utils.c +++ b/ui/gtk/dlg_utils.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <stdarg.h> diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c index 90811ed18b..daf2defaa3 100644 --- a/ui/gtk/drag_and_drop.c +++ b/ui/gtk/drag_and_drop.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 <stdio.h> diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c index 19ba870234..cfea157e8d 100644 --- a/ui/gtk/edit_packet_comment_dlg.c +++ b/ui/gtk/edit_packet_comment_dlg.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/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c index 2535cf42e2..7b57cdb531 100644 --- a/ui/gtk/expert_comp_dlg.c +++ b/ui/gtk/expert_comp_dlg.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> diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c index 7734e28a3c..74c4931f49 100644 --- a/ui/gtk/expert_comp_table.c +++ b/ui/gtk/expert_comp_table.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 <stdlib.h> diff --git a/ui/gtk/export_object.c b/ui/gtk/export_object.c index 00c1961e88..71559dabbd 100644 --- a/ui/gtk/export_object.c +++ b/ui/gtk/export_object.c @@ -24,9 +24,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/ui/gtk/export_object_dicom.c b/ui/gtk/export_object_dicom.c index 3c7d0f4f46..e4c9ca7029 100644 --- a/ui/gtk/export_object_dicom.c +++ b/ui/gtk/export_object_dicom.c @@ -26,9 +26,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <gtk/gtk.h> diff --git a/ui/gtk/export_object_http.c b/ui/gtk/export_object_http.c index 5159b59f49..dee1fb2f5e 100644 --- a/ui/gtk/export_object_http.c +++ b/ui/gtk/export_object_http.c @@ -25,9 +25,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <gtk/gtk.h> diff --git a/ui/gtk/export_object_smb.c b/ui/gtk/export_object_smb.c index e23411e56f..e5dae02668 100644 --- a/ui/gtk/export_object_smb.c +++ b/ui/gtk/export_object_smb.c @@ -28,9 +28,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gtk/gtk.h> diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c index 9d8f17bac9..3eafbc51af 100644 --- a/ui/gtk/export_sslkeys.c +++ b/ui/gtk/export_sslkeys.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 <string.h> diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c index 82c53cc2ba..73c97a2c3c 100644 --- a/ui/gtk/fc_stat.c +++ b/ui/gtk/fc_stat.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> diff --git a/ui/gtk/file_dlg.c b/ui/gtk/file_dlg.c index 57e69ab7ff..d34b150d35 100644 --- a/ui/gtk/file_dlg.c +++ b/ui/gtk/file_dlg.c @@ -31,9 +31,7 @@ * licensed under the GPL2 or later. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <errno.h> diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c index a7aa21bae1..62eba62d8b 100644 --- a/ui/gtk/file_import_dlg.c +++ b/ui/gtk/file_import_dlg.c @@ -24,9 +24,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c index ad9a44cfaf..97b7ce9550 100644 --- a/ui/gtk/fileset_dlg.c +++ b/ui/gtk/fileset_dlg.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> diff --git a/ui/gtk/filter_autocomplete.c b/ui/gtk/filter_autocomplete.c index cbafdc0165..0301e267a1 100644 --- a/ui/gtk/filter_autocomplete.c +++ b/ui/gtk/filter_autocomplete.c @@ -27,9 +27,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c index 790d0b8c65..02b02d3abd 100644 --- a/ui/gtk/filter_dlg.c +++ b/ui/gtk/filter_dlg.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> diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c index 6f677e61bb..9b10e5f8fc 100644 --- a/ui/gtk/filter_expression_save_dlg.c +++ b/ui/gtk/filter_expression_save_dlg.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 <ctype.h> diff --git a/ui/gtk/filter_utils.c b/ui/gtk/filter_utils.c index 6cc157bfc6..3fbdd2c856 100644 --- a/ui/gtk/filter_utils.c +++ b/ui/gtk/filter_utils.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 <gtk/gtk.h> #include <string.h> diff --git a/ui/gtk/find_dlg.c b/ui/gtk/find_dlg.c index ae935365fa..e8085ed65c 100644 --- a/ui/gtk/find_dlg.c +++ b/ui/gtk/find_dlg.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 <ctype.h> diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c index 9db3a6afba..1ed70af33e 100644 --- a/ui/gtk/firewall_dlg.c +++ b/ui/gtk/firewall_dlg.c @@ -34,9 +34,7 @@ /* Copied from ssl-dlg.c */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c index 6a84c4530a..3abe681bfc 100644 --- a/ui/gtk/flow_graph.c +++ b/ui/gtk/flow_graph.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 <gtk/gtk.h> diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c index 5b1a29044b..53e8783b05 100644 --- a/ui/gtk/follow_ssl.c +++ b/ui/gtk/follow_ssl.c @@ -23,9 +23,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c index cc48e9aaa2..12ee1e5179 100644 --- a/ui/gtk/follow_stream.c +++ b/ui/gtk/follow_stream.c @@ -23,9 +23,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c index fee22ea376..00a946e4e9 100644 --- a/ui/gtk/follow_tcp.c +++ b/ui/gtk/follow_tcp.c @@ -23,9 +23,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/gtk/follow_udp.c b/ui/gtk/follow_udp.c index a75d6916b9..fc131fdb2b 100644 --- a/ui/gtk/follow_udp.c +++ b/ui/gtk/follow_udp.c @@ -23,9 +23,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <gtk/gtk.h> diff --git a/ui/gtk/font_utils.c b/ui/gtk/font_utils.c index 2223b546af..0efeb001e9 100644 --- a/ui/gtk/font_utils.c +++ b/ui/gtk/font_utils.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <stdlib.h> #include <stdio.h> diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index 03795efbec..c67ab871f3 100644 --- a/ui/gtk/funnel_stat.c +++ b/ui/gtk/funnel_stat.c @@ -36,9 +36,7 @@ * that can be funneled to dissectors (even plugins) via epan. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c index 8f22a9f1e1..45a0d9acf7 100644 --- a/ui/gtk/goto_dlg.c +++ b/ui/gtk/goto_dlg.c @@ -23,9 +23,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gtk/gtk.h> diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c index 9cfd7a03f9..a0d50762c2 100644 --- a/ui/gtk/graph_analysis.c +++ b/ui/gtk/graph_analysis.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 <string.h> diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c index 7d2c5760e3..3e85b5e20d 100644 --- a/ui/gtk/gsm_a_stat.c +++ b/ui/gtk/gsm_a_stat.c @@ -30,9 +30,7 @@ * This TAP provides statistics for the GSM A-Interface: */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <gtk/gtk.h> diff --git a/ui/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c index ff21d07f43..1ca0c0153f 100644 --- a/ui/gtk/gsm_map_stat.c +++ b/ui/gtk/gsm_map_stat.c @@ -30,9 +30,7 @@ * This TAP provides statistics for GSM MAP Operations: */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <gtk/gtk.h> diff --git a/ui/gtk/gsm_map_summary.c b/ui/gtk/gsm_map_summary.c index b96da51add..80a585e3c1 100644 --- a/ui/gtk/gsm_map_summary.c +++ b/ui/gtk/gsm_map_summary.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 <gtk/gtk.h> diff --git a/ui/gtk/gtk_iface_monitor.c b/ui/gtk/gtk_iface_monitor.c index 64508e77f1..63e4c31d0f 100644 --- a/ui/gtk/gtk_iface_monitor.c +++ b/ui/gtk/gtk_iface_monitor.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_LIBPCAP diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c index e09287facd..07e26f21d1 100644 --- a/ui/gtk/gtp_stat.c +++ b/ui/gtk/gtp_stat.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/ui/gtk/gui_stat_util.c b/ui/gtk/gui_stat_util.c index ee284631fe..793707bc83 100644 --- a/ui/gtk/gui_stat_util.c +++ b/ui/gtk/gui_stat_util.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 <gtk/gtk.h> diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index 58c25ab1ce..8888585957 100644 --- a/ui/gtk/gui_utils.c +++ b/ui/gtk/gui_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 "config.h" #include <string.h> #include <locale.h> diff --git a/ui/gtk/h225_counter.c b/ui/gtk/h225_counter.c index cddcfb289b..8ab0a4f720 100644 --- a/ui/gtk/h225_counter.c +++ b/ui/gtk/h225_counter.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/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c index 68992fdeee..3b49070679 100644 --- a/ui/gtk/h225_ras_srt.c +++ b/ui/gtk/h225_ras_srt.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/ui/gtk/help_dlg.c b/ui/gtk/help_dlg.c index 7b7e5d5c94..bcd77bc00e 100644 --- a/ui/gtk/help_dlg.c +++ b/ui/gtk/help_dlg.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 <errno.h> diff --git a/ui/gtk/hostlist_eth.c b/ui/gtk/hostlist_eth.c index 9e4eab7e91..5311883ca0 100644 --- a/ui/gtk/hostlist_eth.c +++ b/ui/gtk/hostlist_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 <string.h> diff --git a/ui/gtk/hostlist_fc.c b/ui/gtk/hostlist_fc.c index 47dc3ef07f..2b0587c798 100644 --- a/ui/gtk/hostlist_fc.c +++ b/ui/gtk/hostlist_fc.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> diff --git a/ui/gtk/hostlist_fddi.c b/ui/gtk/hostlist_fddi.c index 0b6bc6cd99..a898ed3c9a 100644 --- a/ui/gtk/hostlist_fddi.c +++ b/ui/gtk/hostlist_fddi.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> diff --git a/ui/gtk/hostlist_ip.c b/ui/gtk/hostlist_ip.c index be3c0f23f1..09e099ab5b 100644 --- a/ui/gtk/hostlist_ip.c +++ b/ui/gtk/hostlist_ip.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/gtk/hostlist_ipv6.c b/ui/gtk/hostlist_ipv6.c index e78d4c878f..ac59f46096 100644 --- a/ui/gtk/hostlist_ipv6.c +++ b/ui/gtk/hostlist_ipv6.c @@ -23,9 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/gtk/hostlist_ipx.c b/ui/gtk/hostlist_ipx.c index 0f0d2aae24..81a70d308a 100644 --- a/ui/gtk/hostlist_ipx.c +++ b/ui/gtk/hostlist_ipx.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> diff --git a/ui/gtk/hostlist_jxta.c b/ui/gtk/hostlist_jxta.c index 4063162293..5a32efc77c 100644 --- a/ui/gtk/hostlist_jxta.c +++ b/ui/gtk/hostlist_jxta.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> diff --git a/ui/gtk/hostlist_ncp.c b/ui/gtk/hostlist_ncp.c index effe2918e2..785f69c86a 100644 --- a/ui/gtk/hostlist_ncp.c +++ b/ui/gtk/hostlist_ncp.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> diff --git a/ui/gtk/hostlist_rsvp.c b/ui/gtk/hostlist_rsvp.c index 7100ddf966..c524b896b0 100644 --- a/ui/gtk/hostlist_rsvp.c +++ b/ui/gtk/hostlist_rsvp.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/gtk/hostlist_sctp.c b/ui/gtk/hostlist_sctp.c index 4c30b79ced..0fd1f94e03 100644 --- a/ui/gtk/hostlist_sctp.c +++ b/ui/gtk/hostlist_sctp.c @@ -21,9 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index 907f8a1305..c903fb1e1c 100644 --- a/ui/gtk/hostlist_table.c +++ b/ui/gtk/hostlist_table.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 <stdlib.h> diff --git a/ui/gtk/hostlist_tcpip.c b/ui/gtk/hostlist_tcpip.c index 5076a72715..e19ae5e7c9 100644 --- a/ui/gtk/hostlist_tcpip.c +++ b/ui/gtk/hostlist_tcpip.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> diff --git a/ui/gtk/hostlist_tr.c b/ui/gtk/hostlist_tr.c index 11205d403c..524194663d 100644 --- a/ui/gtk/hostlist_tr.c +++ b/ui/gtk/hostlist_tr.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> diff --git a/ui/gtk/hostlist_udpip.c b/ui/gtk/hostlist_udpip.c index 273a4afac7..f93b9086dc 100644 --- a/ui/gtk/hostlist_udpip.c +++ b/ui/gtk/hostlist_udpip.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> diff --git a/ui/gtk/hostlist_usb.c b/ui/gtk/hostlist_usb.c index 9b30922a5a..2c7c6391a6 100644 --- a/ui/gtk/hostlist_usb.c +++ b/ui/gtk/hostlist_usb.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> diff --git a/ui/gtk/hostlist_wlan.c b/ui/gtk/hostlist_wlan.c index 63af104bf3..2d5a61c1c4 100644 --- a/ui/gtk/hostlist_wlan.c +++ b/ui/gtk/hostlist_wlan.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> diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index fcda275f7d..02d64f2a2e 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.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 <stdio.h> #include <math.h> diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index 44954e80a8..df8ef5bef6 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -23,9 +23,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c index d20bf6aa8c..021eb609be 100644 --- a/ui/gtk/ldap_stat.c +++ b/ui/gtk/ldap_stat.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> diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c index 35381b1266..817a691e96 100644 --- a/ui/gtk/mac_lte_stat_dlg.c +++ b/ui/gtk/mac_lte_stat_dlg.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/ui/gtk/macros_dlg.c b/ui/gtk/macros_dlg.c index 6e6c241b7f..41b1445946 100644 --- a/ui/gtk/macros_dlg.c +++ b/ui/gtk/macros_dlg.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 <stdlib.h> #include <gtk/gtk.h> diff --git a/ui/gtk/main.c b/ui/gtk/main.c index c3384d827b..5576e98ef6 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.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 <gtk/gtk.h> #include <gdk/gdkkeysyms.h> diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c index b2bd816133..557ba072d7 100644 --- a/ui/gtk/main_80211_toolbar.c +++ b/ui/gtk/main_80211_toolbar.c @@ -26,9 +26,7 @@ * This file implements the "80211" toolbar for Wireshark. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <string.h> diff --git a/ui/gtk/main_airpcap_toolbar.c b/ui/gtk/main_airpcap_toolbar.c index 9d2bd36d2d..84820af8cb 100644 --- a/ui/gtk/main_airpcap_toolbar.c +++ b/ui/gtk/main_airpcap_toolbar.c @@ -26,9 +26,7 @@ * This file implements the wireless toolbar for Wireshark. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_AIRPCAP diff --git a/ui/gtk/main_filter_toolbar.c b/ui/gtk/main_filter_toolbar.c index 591e0a7d39..6b92301785 100644 --- a/ui/gtk/main_filter_toolbar.c +++ b/ui/gtk/main_filter_toolbar.c @@ -26,9 +26,7 @@ * This file implements the "filter" toolbar for Wireshark. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <string.h> diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 2ffd39108c..a3ae5447ab 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -21,9 +21,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 <gtk/gtk.h> diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index a30bfddd4c..fc8d4a4f65 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -22,9 +22,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/ui/gtk/main_titlebar.c b/ui/gtk/main_titlebar.c index bcae30299a..a269fe49bc 100644 --- a/ui/gtk/main_titlebar.c +++ b/ui/gtk/main_titlebar.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/prefs.h> diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c index 36eb6b54e7..29ceefa2f4 100644 --- a/ui/gtk/main_toolbar.c +++ b/ui/gtk/main_toolbar.c @@ -27,9 +27,7 @@ * This file implements the "main" toolbar for Wireshark. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <gtk/gtk.h> diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index 16b18f387c..d185512066 100644 --- a/ui/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.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 <time.h> diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c index a643a1ae2e..8e932bb861 100644 --- a/ui/gtk/manual_addr_resolv.c +++ b/ui/gtk/manual_addr_resolv.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/ui/gtk/mcast_stream.c b/ui/gtk/mcast_stream.c index 2c1f5308d4..44fd51b043 100644 --- a/ui/gtk/mcast_stream.c +++ b/ui/gtk/mcast_stream.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" #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c index d2cefcec81..e7d3329a89 100644 --- a/ui/gtk/mcast_stream_dlg.c +++ b/ui/gtk/mcast_stream_dlg.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 <locale.h> diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c index fe6aa43914..344e7e8d3a 100644 --- a/ui/gtk/megaco_stat.c +++ b/ui/gtk/megaco_stat.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/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c index 7943fedbd5..83bb11b06d 100644 --- a/ui/gtk/mgcp_stat.c +++ b/ui/gtk/mgcp_stat.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/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c index 58dc68ed84..4db431c1ff 100644 --- a/ui/gtk/mtp3_stat.c +++ b/ui/gtk/mtp3_stat.c @@ -30,9 +30,7 @@ * This TAP provides statistics for MTP3: */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <gtk/gtk.h> diff --git a/ui/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c index bc73fe7e58..2eac957311 100644 --- a/ui/gtk/mtp3_summary.c +++ b/ui/gtk/mtp3_summary.c @@ -27,9 +27,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c index ebc43fceb9..dc472ff9b2 100644 --- a/ui/gtk/ncp_stat.c +++ b/ui/gtk/ncp_stat.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> diff --git a/ui/gtk/packet_history.c b/ui/gtk/packet_history.c index f813477f39..46718fba46 100644 --- a/ui/gtk/packet_history.c +++ b/ui/gtk/packet_history.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c index f73f1df553..c2ac868a75 100644 --- a/ui/gtk/packet_list.c +++ b/ui/gtk/packet_list.c @@ -25,9 +25,7 @@ * USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c index 3a6e0ff15c..b46b79981d 100644 --- a/ui/gtk/packet_list_store.c +++ b/ui/gtk/packet_list_store.c @@ -28,9 +28,7 @@ /* This code was originally based on the GTK+ Tree View tutorial at * http://scentric.net/tutorial */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c index e6ff7691c6..95af737f81 100644 --- a/ui/gtk/packet_panes.c +++ b/ui/gtk/packet_panes.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 <ctype.h> diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index 845464d23d..e350cf9422 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -31,9 +31,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c index 690cc67c38..a9d61cc06b 100644 --- a/ui/gtk/pixmap_save.c +++ b/ui/gtk/pixmap_save.c @@ -24,9 +24,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <errno.h> #include <gtk/gtk.h> diff --git a/ui/gtk/plugins_dlg.c b/ui/gtk/plugins_dlg.c index ce71bdb22b..19793a6f49 100644 --- a/ui/gtk/plugins_dlg.c +++ b/ui/gtk/plugins_dlg.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 <gtk/gtk.h> diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c index 8651e5e5dc..1baa8ad611 100644 --- a/ui/gtk/prefs_capture.c +++ b/ui/gtk/prefs_capture.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_LIBPCAP diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c index 836c1313ae..b6259cd71d 100644 --- a/ui/gtk/prefs_column.c +++ b/ui/gtk/prefs_column.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index f9c34d92b8..03af9f2938 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.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 <gtk/gtk.h> diff --git a/ui/gtk/prefs_filter_expressions.c b/ui/gtk/prefs_filter_expressions.c index 67922e59ef..bfbbc474f8 100644 --- a/ui/gtk/prefs_filter_expressions.c +++ b/ui/gtk/prefs_filter_expressions.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c index df28f522ed..bed3574478 100644 --- a/ui/gtk/prefs_gui.c +++ b/ui/gtk/prefs_gui.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 <gtk/gtk.h> diff --git a/ui/gtk/prefs_layout.c b/ui/gtk/prefs_layout.c index 633e198383..3ba979cb7b 100644 --- a/ui/gtk/prefs_layout.c +++ b/ui/gtk/prefs_layout.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 <gtk/gtk.h> diff --git a/ui/gtk/prefs_stream.c b/ui/gtk/prefs_stream.c index a2fdca1aa4..92d582e17d 100644 --- a/ui/gtk/prefs_stream.c +++ b/ui/gtk/prefs_stream.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 <gtk/gtk.h> diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c index 5539744c94..95bf6f8466 100644 --- a/ui/gtk/print_dlg.c +++ b/ui/gtk/print_dlg.c @@ -22,9 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c index 7d9056dfdc..ffe73dfd4e 100644 --- a/ui/gtk/profile_dlg.c +++ b/ui/gtk/profile_dlg.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/ui/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c index bb40c21034..675252e50e 100644 --- a/ui/gtk/progress_dlg.c +++ b/ui/gtk/progress_dlg.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> diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c index a77991f7d9..400e367e49 100644 --- a/ui/gtk/proto_dlg.c +++ b/ui/gtk/proto_dlg.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 <gtk/gtk.h> diff --git a/ui/gtk/proto_help.c b/ui/gtk/proto_help.c index 3b6ee89f21..bbf5fe04d0 100644 --- a/ui/gtk/proto_help.c +++ b/ui/gtk/proto_help.c @@ -24,9 +24,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" /* This file basically does nothing except remind us how this worked before * the menu code was rewritten to no longer use the deprecated ItemFactory diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c index d076560986..c75ffbed9d 100644 --- a/ui/gtk/proto_hier_stats_dlg.c +++ b/ui/gtk/proto_hier_stats_dlg.c @@ -22,9 +22,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/gtk/proto_hier_tree_model.c b/ui/gtk/proto_hier_tree_model.c index bdec0f50d4..f6d58aac83 100644 --- a/ui/gtk/proto_hier_tree_model.c +++ b/ui/gtk/proto_hier_tree_model.c @@ -25,9 +25,7 @@ /* This code was originally based on the GTK+ Tree View tutorial at * http://scentric.net/tutorial */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/ui/gtk/proto_tree_model.c b/ui/gtk/proto_tree_model.c index d6ed53d200..b177965a3a 100644 --- a/ui/gtk/proto_tree_model.c +++ b/ui/gtk/proto_tree_model.c @@ -25,9 +25,7 @@ /* This code was originally based on the GTK+ Tree View tutorial at * http://scentric.net/tutorial */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c index 67b4e66759..110d5bd1f9 100644 --- a/ui/gtk/radius_stat.c +++ b/ui/gtk/radius_stat.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/ui/gtk/range_utils.c b/ui/gtk/range_utils.c index ef2eac3317..2ee1ccdab0 100644 --- a/ui/gtk/range_utils.c +++ b/ui/gtk/range_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 <gtk/gtk.h> diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c index 71a5233eee..772e13b5d5 100644 --- a/ui/gtk/rlc_lte_graph.c +++ b/ui/gtk/rlc_lte_graph.c @@ -23,9 +23,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 <math.h> diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c index f08abb8d2b..290f3b80c6 100644 --- a/ui/gtk/rlc_lte_stat_dlg.c +++ b/ui/gtk/rlc_lte_stat_dlg.c @@ -27,9 +27,7 @@ - per-channel graph tap? */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/ui/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c index 9ef38de3ed..a99005bbb6 100644 --- a/ui/gtk/rpc_progs.c +++ b/ui/gtk/rpc_progs.c @@ -28,9 +28,7 @@ * It serves as an example on how to use the tap api. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c index e8acc8ef62..3f7d32afa1 100644 --- a/ui/gtk/rpc_stat.c +++ b/ui/gtk/rpc_stat.c @@ -28,9 +28,7 @@ * It serves as an example on how to use the tap api. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 3071841df2..ffbaa5d5b5 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.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 <stdio.h> #include <math.h> diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c index c9e5653087..ffa363e845 100644 --- a/ui/gtk/rtp_player.c +++ b/ui/gtk/rtp_player.c @@ -51,9 +51,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_LIBPORTAUDIO #include <math.h> diff --git a/ui/gtk/rtp_stream.c b/ui/gtk/rtp_stream.c index af108b7062..733542946d 100644 --- a/ui/gtk/rtp_stream.c +++ b/ui/gtk/rtp_stream.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index df23256f85..c46ea2da88 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -25,9 +25,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include "config.h" #include <stdio.h> #include <string.h> diff --git a/ui/gtk/scsi_stat.c b/ui/gtk/scsi_stat.c index 629921519d..028736439f 100644 --- a/ui/gtk/scsi_stat.c +++ b/ui/gtk/scsi_stat.c @@ -26,9 +26,7 @@ * to Wireshark. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index 3f0274fc74..615b9807e1 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.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 <gtk/gtk.h> diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c index b18b6cf6a4..0e89d5f39c 100644 --- a/ui/gtk/sctp_byte_graph_dlg.c +++ b/ui/gtk/sctp_byte_graph_dlg.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 <math.h> #include <string.h> diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c index b017b97e65..787564385d 100644 --- a/ui/gtk/sctp_chunk_stat.c +++ b/ui/gtk/sctp_chunk_stat.c @@ -25,9 +25,7 @@ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c index a7fbdc6d91..9cf3013846 100644 --- a/ui/gtk/sctp_chunk_stat_dlg.c +++ b/ui/gtk/sctp_chunk_stat_dlg.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 <gtk/gtk.h> diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c index 9895821dc8..50052906e8 100644 --- a/ui/gtk/sctp_error_dlg.c +++ b/ui/gtk/sctp_error_dlg.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 <gtk/gtk.h> diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c index 01a777a9bc..d51f904444 100644 --- a/ui/gtk/sctp_graph_dlg.c +++ b/ui/gtk/sctp_graph_dlg.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 <math.h> #include <string.h> diff --git a/ui/gtk/sctp_stat.c b/ui/gtk/sctp_stat.c index 2c5187a545..bf8abba005 100644 --- a/ui/gtk/sctp_stat.c +++ b/ui/gtk/sctp_stat.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> #include <math.h> diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c index cda40fc2b9..80c938f940 100644 --- a/ui/gtk/sctp_stat_dlg.c +++ b/ui/gtk/sctp_stat_dlg.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 <gtk/gtk.h> diff --git a/ui/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c index 7bf70ff9be..fbd5d56f02 100644 --- a/ui/gtk/service_response_time_table.c +++ b/ui/gtk/service_response_time_table.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 <gtk/gtk.h> #include <stdio.h> diff --git a/ui/gtk/simple_dialog.c b/ui/gtk/simple_dialog.c index f867cc8b67..513dacc5b5 100644 --- a/ui/gtk/simple_dialog.c +++ b/ui/gtk/simple_dialog.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 <gtk/gtk.h> diff --git a/ui/gtk/sip_stat.c b/ui/gtk/sip_stat.c index 10fcfa4140..50b7ba4997 100644 --- a/ui/gtk/sip_stat.c +++ b/ui/gtk/sip_stat.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 <gtk/gtk.h> diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c index d6819c13bd..f855ef6072 100644 --- a/ui/gtk/smb2_stat.c +++ b/ui/gtk/smb2_stat.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> diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c index 24ef3982f9..866a9cdcf2 100644 --- a/ui/gtk/smb_stat.c +++ b/ui/gtk/smb_stat.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> diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c index dbe2df4ea0..a803efc10f 100644 --- a/ui/gtk/stats_tree_stat.c +++ b/ui/gtk/stats_tree_stat.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 <gtk/gtk.h> diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c index 53d3bc9c18..8ca65b20eb 100644 --- a/ui/gtk/stock_icons.c +++ b/ui/gtk/stock_icons.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 <gtk/gtk.h> diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c index a0184502e0..ceb14d475d 100644 --- a/ui/gtk/summary_dlg.c +++ b/ui/gtk/summary_dlg.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 <time.h> diff --git a/ui/gtk/supported_protos_dlg.c b/ui/gtk/supported_protos_dlg.c index 5e8f031edb..62ff363973 100644 --- a/ui/gtk/supported_protos_dlg.c +++ b/ui/gtk/supported_protos_dlg.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/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index c5d8b43f99..f8a1283147 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.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/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index 5b6c6452d1..61eeb6997d 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -24,9 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <math.h> diff --git a/ui/gtk/text_page_utils.c b/ui/gtk/text_page_utils.c index c0259fb422..4959c0acc9 100644 --- a/ui/gtk/text_page_utils.c +++ b/ui/gtk/text_page_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 "config.h" #include <string.h> #include <stdio.h> #include <errno.h> diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c index 803686d4ba..37ad3eeb38 100644 --- a/ui/gtk/time_shift_dlg.c +++ b/ui/gtk/time_shift_dlg.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 <ctype.h> diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index 5b7816965a..7901e35d4d 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -36,9 +36,7 @@ * - Allow reordering via drag and drop */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <stdlib.h> #include <stdio.h> diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c index 969c615513..5dc285cce5 100644 --- a/ui/gtk/voip_calls.c +++ b/ui/gtk/voip_calls.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> #include <epan/epan.h> diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index 0c440ccffb..373c3e9c5e 100644 --- a/ui/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.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 <stdio.h> #include <string.h> diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c index 71431e887e..c32103b18d 100644 --- a/ui/gtk/webbrowser.c +++ b/ui/gtk/webbrowser.c @@ -65,9 +65,7 @@ * On the other hand, see bug 2699, in which xdg-open is itself buggy. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include "config.h" #include <string.h> /* strlen, strstr */ #include <gtk/gtk.h> diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index 8d923dd852..dc96dbf502 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -23,9 +23,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <string.h> diff --git a/ui/gtk/wsp_stat.c b/ui/gtk/wsp_stat.c index a92dcbaf84..1333ca23dd 100644 --- a/ui/gtk/wsp_stat.c +++ b/ui/gtk/wsp_stat.c @@ -23,9 +23,7 @@ */ /* #define DEBUG do{ printf("%s:%d ",__FILE__,__LINE__);} while(0); */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <string.h> #include <gtk/gtk.h> diff --git a/ui/help_url.c b/ui/help_url.c index 5c22aeb868..76ecb54e00 100644 --- a/ui/help_url.c +++ b/ui/help_url.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/ui/iface_lists.c b/ui/iface_lists.c index 5f7887e717..f9bcb92ddc 100644 --- a/ui/iface_lists.c +++ b/ui/iface_lists.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_LIBPCAP diff --git a/ui/text_import.c b/ui/text_import.c index 6c8d9321b1..6b7243ee9e 100644 --- a/ui/text_import.c +++ b/ui/text_import.c @@ -75,9 +75,7 @@ * snaplength is automatically set to 64K. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" /* * Just make sure we include the prototype for strptime as well @@ -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/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 9c0f6b0650..d4c686dcef 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.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 <tchar.h> diff --git a/wiretap/ascend.y b/wiretap/ascend.y index 63c39beaeb..2f49403a9c 100644 --- a/wiretap/ascend.y +++ b/wiretap/ascend.y @@ -128,9 +128,7 @@ XMIT-Max7:20: (task "_brouterControlTask" at 0xb094ac20, time: 1481.51) 20 octet */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdio.h> #include <stdlib.h> diff --git a/wiretap/ascend_scanner.l b/wiretap/ascend_scanner.l index 69ad4f1bbd..0f2ac4c991 100644 --- a/wiretap/ascend_scanner.l +++ b/wiretap/ascend_scanner.l @@ -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 <stdio.h> #include <stdlib.h> diff --git a/wiretap/k12text.l b/wiretap/k12text.l index c9854cc01e..6071bcacd8 100644 --- a/wiretap/k12text.l +++ b/wiretap/k12text.l @@ -64,9 +64,7 @@ * - verify encapsulations */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include <stdlib.h> #include <string.h> #include <errno.h> diff --git a/wsutil/unicode-utils.h b/wsutil/unicode-utils.h index 72a0ab2ca4..1abe7d4106 100644 --- a/wsutil/unicode-utils.h +++ b/wsutil/unicode-utils.h @@ -27,9 +27,7 @@ #ifdef _WIN32 -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <windows.h> |