osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Stig Bjørlykke 2011-04-21 13:13:39 +00:00
parent 09dc5526dc
commit 43851d797d
13 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/wslua/init_wslua.c
View File

@ -26,6 +26,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "wslua.h" #include "wslua.h"
#include <epan/dissectors/packet-frame.h> #include <epan/dissectors/packet-frame.h>
#include <epan/nstime.h> #include <epan/nstime.h>

3
epan/wslua/make-reg.pl
View File

@ -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 "extern void wslua_register_functions(lua_State* L);\n";
print H "\n\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 '#include "wslua.h"' . "\n\n";
print C "void wslua_register_classes(lua_State* L) { \n"; print C "void wslua_register_classes(lua_State* L) { \n";

4
epan/wslua/make-taps.pl
View File

@ -155,6 +155,10 @@ print CFILE <<"HEADER";
/* This file is autogenerated from ./taps by ./make-taps.pl */ /* This file is autogenerated from ./taps by ./make-taps.pl */
/* DO NOT EDIT! */ /* DO NOT EDIT! */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "wslua.h" #include "wslua.h"
HEADER HEADER

4
epan/wslua/wslua.h
View File

@ -31,10 +31,6 @@
#ifndef _PACKET_LUA_H #ifndef _PACKET_LUA_H
#define _PACKET_LUA_H #define _PACKET_LUA_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <glib.h> #include <glib.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>

4
epan/wslua/wslua_dumper.c
View File

@ -26,6 +26,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 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 */ /* WSLUA_MODULE Dumper Saving capture files */
#include "wslua.h" #include "wslua.h"

4
epan/wslua/wslua_field.c
View File

@ -26,6 +26,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 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 */ /* WSLUA_MODULE Field Obtaining dissection data */
#include "wslua.h" #include "wslua.h"

4
epan/wslua/wslua_gui.c
View File

@ -24,6 +24,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "wslua.h" #include "wslua.h"
/* WSLUA_MODULE Gui GUI support */ /* WSLUA_MODULE Gui GUI support */

4
epan/wslua/wslua_listener.c
View File

@ -28,6 +28,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 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 */ /* WSLUA_MODULE Listener Post-dissection packet analysis */
#include "wslua.h" #include "wslua.h"

4
epan/wslua/wslua_pinfo.c
View File

@ -27,6 +27,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 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 */ /* WSLUA_MODULE Pinfo Obtaining packet information */

4
epan/wslua/wslua_proto.c
View File

@ -27,6 +27,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 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 */ /* WSLUA_MODULE Proto Functions for writing dissectors */
#include "wslua.h" #include "wslua.h"

4
epan/wslua/wslua_tree.c
View File

@ -27,6 +27,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 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 */ /* WSLUA_MODULE Tree Adding information to the dissection tree */
#include "wslua.h" #include "wslua.h"

4
epan/wslua/wslua_tvb.c
View File

@ -28,6 +28,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 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 */ /* WSLUA_MODULE Tvb Functions for handling packet data */
#include "wslua.h" #include "wslua.h"

4
epan/wslua/wslua_util.c
View File

@ -24,6 +24,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 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 */ /* WSLUA_MODULE Utility Utility Functions */
#include "wslua.h" #include "wslua.h"