diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-20 01:48:30 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2012-09-20 01:48:30 +0000 |
| commit | 3729335973b966a8b9b0f887c637d42be047a790 (patch) | |
| tree | 3c6bda38058982470b2a7a3f4244007dbafe376c /epan | |
| parent | 3551a86c36fa9f27dede601320a812d2ce0ae941 (diff) | |
| download | wireshark-3729335973b966a8b9b0f887c637d42be047a790.tar.gz wireshark-3729335973b966a8b9b0f887c637d42be047a790.tar.bz2 wireshark-3729335973b966a8b9b0f887c637d42be047a790.zip | |
We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45016
Diffstat (limited to 'epan')
121 files changed, 67 insertions, 309 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> |