Include config.h only from .c files.

This avoids a warning building epan.c which includes both config.h and wslua.h
(duplicate defines from config.h)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36751 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c
index c6da58a66b9defef4b4136d1de000d3dcc414630..33281421f38e27146fdcfd5cdf67992285283553 100644 (file)
--- a/epan/wslua/init_wslua.c
+++ b/epan/wslua/init_wslua.c
@@ -26,6 +26,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wslua.h"
 #include <epan/dissectors/packet-frame.h>
 #include <epan/nstime.h>

diff --git a/epan/wslua/make-reg.pl b/epan/wslua/make-reg.pl
index d2ba45915c399bb3d1a0b4e89770f200c6a0a875..45e64f4ea9c7323fefdb6cd51436af1dd4c33cde 100755 (executable)
--- a/epan/wslua/make-reg.pl
+++ b/epan/wslua/make-reg.pl
@@ -56,6 +56,9 @@ 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 d1a2e43314c7b36315e2df00a130cf2a6e5ae35f..c916d86cd67a0258888d93a859a5adea343b15e8 100755 (executable)
--- a/epan/wslua/make-taps.pl
+++ b/epan/wslua/make-taps.pl
@@ -155,6 +155,10 @@ 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"
 
 HEADER

diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h
index 86004656b0a45d7c7eb0ed010d1f647464eed6ec..7c595770d1b1615d1bccc1456370a019381375c8 100644 (file)
--- a/epan/wslua/wslua.h
+++ b/epan/wslua/wslua.h
@@ -31,10 +31,6 @@
 #ifndef _PACKET_LUA_H
 #define _PACKET_LUA_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <glib.h>
 #include <errno.h>
 #include <string.h>

diff --git a/epan/wslua/wslua_dumper.c b/epan/wslua/wslua_dumper.c
index 9fffd5406eab7ddc688e1d99b1df5c62ccefe311..af2e7c5b81487d9ae6947ae8bf1c8fedc4c1025c 100644 (file)
--- a/epan/wslua/wslua_dumper.c
+++ b/epan/wslua/wslua_dumper.c
@@ -26,6 +26,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* WSLUA_MODULE Dumper Saving capture files */
 
 #include "wslua.h"

diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c
index f39633b2eb40a203a6cb88357669e63821b0a245..9d140b8d250b3e228b3557e47c74eea0a1482797 100644 (file)
--- a/epan/wslua/wslua_field.c
+++ b/epan/wslua/wslua_field.c
@@ -26,6 +26,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* WSLUA_MODULE Field Obtaining dissection data */
 
 #include "wslua.h"

diff --git a/epan/wslua/wslua_gui.c b/epan/wslua/wslua_gui.c
index 83f77311d3ff5f76885e57813e23991ec97fe9cb..6577c084d3896fcee0bf5d77768353c7babbad74 100644 (file)
--- a/epan/wslua/wslua_gui.c
+++ b/epan/wslua/wslua_gui.c
@@ -24,6 +24,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wslua.h"
 
 /* WSLUA_MODULE Gui GUI support */

diff --git a/epan/wslua/wslua_listener.c b/epan/wslua/wslua_listener.c
index cbd46475adc1454965eeadbf3b6680245de0f6d7..6e43f6b51717c99bcd3386a995e4c98b21f85d0e 100644 (file)
--- a/epan/wslua/wslua_listener.c
+++ b/epan/wslua/wslua_listener.c
@@ -28,6 +28,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* WSLUA_MODULE Listener Post-dissection packet analysis */
 
 #include "wslua.h"

diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c
index 51cd1bc5ca98719f8a7f3f4eed84a12a8b0d5dbe..8c6b924ac66ea2d852a43046e53aa7dd92effd6f 100644 (file)
--- a/epan/wslua/wslua_pinfo.c
+++ b/epan/wslua/wslua_pinfo.c
@@ -27,6 +27,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, 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 5d3b04e61069d897986a26ed01e204983137d294..db4b5da3b6815bde269225828e21090f84e4cab5 100644 (file)
--- a/epan/wslua/wslua_proto.c
+++ b/epan/wslua/wslua_proto.c
@@ -27,6 +27,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* WSLUA_MODULE Proto Functions for writing dissectors */
 
 #include "wslua.h"

diff --git a/epan/wslua/wslua_tree.c b/epan/wslua/wslua_tree.c
index eb48103cf29bf71b9c6bda04dc8cf8a05f3616a6..1c90c7964de06d8290042fe1386287615a805c29 100644 (file)
--- a/epan/wslua/wslua_tree.c
+++ b/epan/wslua/wslua_tree.c
@@ -27,6 +27,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* WSLUA_MODULE Tree Adding information to the dissection tree */
 
 #include "wslua.h"

diff --git a/epan/wslua/wslua_tvb.c b/epan/wslua/wslua_tvb.c
index f308216bc8702f59849818ce0cb33a953ac25129..222e42d9fb22e44de85902bc76db295075055d65 100644 (file)
--- a/epan/wslua/wslua_tvb.c
+++ b/epan/wslua/wslua_tvb.c
@@ -28,6 +28,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* WSLUA_MODULE Tvb Functions for handling packet data */
 
 #include "wslua.h"

diff --git a/epan/wslua/wslua_util.c b/epan/wslua/wslua_util.c
index 46a656b74e9adc6f357acd525dbe564c4b3bc015..6620980ac5293110995352f4eaecf87c60e4378e 100644 (file)
--- a/epan/wslua/wslua_util.c
+++ b/epan/wslua/wslua_util.c
@@ -24,6 +24,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* WSLUA_MODULE Utility Utility Functions */
 
 #include "wslua.h"