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)

svn path=/trunk/; revision=36751

13 files changed, 47 insertions, 4 deletions

diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c
index c6da58a66b..33281421f3 100644
--- 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 d2ba45915c..45e64f4ea9 100755
--- 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 d1a2e43314..c916d86cd6 100755
--- 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 86004656b0..7c595770d1 100644
--- 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 9fffd5406e..af2e7c5b81 100644
--- 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 f39633b2eb..9d140b8d25 100644
--- 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 83f77311d3..6577c084d3 100644
--- 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 cbd46475ad..6e43f6b517 100644
--- 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 51cd1bc5ca..8c6b924ac6 100644
--- 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 5d3b04e610..db4b5da3b6 100644
--- 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 eb48103cf2..1c90c7964d 100644
--- 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 f308216bc8..222e42d9fb 100644
--- 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 46a656b74e..6620980ac5 100644
--- 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"