diff options
author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-02-02 11:54:33 +0000 |
---|---|---|
committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-02-02 11:54:33 +0000 |
commit | 150c02bced3142f7afbce0652ec14dcc435380db (patch) | |
tree | 6357d956875299f751991dc30b61e93b34179f6f | |
parent | edff498ea645db94cc1789376eba963bb002c4a0 (diff) |
Include config.h in preparation of moving the definition
of _U_ from the compiler command line into config.h
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40806 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | capture_stop_conditions.c | 4 | ||||
-rw-r--r-- | conditions.c | 4 | ||||
-rw-r--r-- | epan/asm_utils.c | 8 | ||||
-rw-r--r-- | epan/dfilter/drange.c | 4 | ||||
-rw-r--r-- | epan/dtd_grammar.lemon | 4 | ||||
-rw-r--r-- | epan/dtd_preparse.l | 4 | ||||
-rw-r--r-- | tools/lemon/lemon.c | 4 |
7 files changed, 30 insertions, 2 deletions
diff --git a/capture_stop_conditions.c b/capture_stop_conditions.c index 09ac5b7d4a..d23f78ced1 100644 --- a/capture_stop_conditions.c +++ b/capture_stop_conditions.c @@ -22,6 +22,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <time.h> #include <string.h> #include <stdlib.h> diff --git a/conditions.c b/conditions.c index f064587fea..882f9b4d7a 100644 --- a/conditions.c +++ b/conditions.c @@ -22,6 +22,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <string.h> #include <stdlib.h> #include <stdarg.h> diff --git a/epan/asm_utils.c b/epan/asm_utils.c index a76029ae21..33adb6fe58 100644 --- a/epan/asm_utils.c +++ b/epan/asm_utils.c @@ -22,6 +22,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <string.h> #include <ctype.h> #include <glib.h> @@ -35,7 +39,7 @@ wrs_strcmp(gconstpointer a, gconstpointer b) return strcmp((const char*)a, (const char*)b); } -gint +gint wrs_strcmp_with_data(gconstpointer a, gconstpointer b, gpointer user_data _U_) { return strcmp((const char*)a, (const char*)b); @@ -47,7 +51,7 @@ wrs_str_equal(gconstpointer a, gconstpointer b) return !strcmp((const char*)a, (const char*)b); } -guchar +guchar wrs_check_charset(const guchar table[256], const char *str) { const char *p = str; diff --git a/epan/dfilter/drange.c b/epan/dfilter/drange.c index 218b8f3c01..800386680f 100644 --- a/epan/dfilter/drange.c +++ b/epan/dfilter/drange.c @@ -23,6 +23,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "drange.h" /* drange_node constructor */ diff --git a/epan/dtd_grammar.lemon b/epan/dtd_grammar.lemon index 024dedc4e0..2ae997d10a 100644 --- a/epan/dtd_grammar.lemon +++ b/epan/dtd_grammar.lemon @@ -27,6 +27,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <stdio.h> #include <glib.h> #include <assert.h> diff --git a/epan/dtd_preparse.l b/epan/dtd_preparse.l index 7e951b0f6b..2857296e6f 100644 --- a/epan/dtd_preparse.l +++ b/epan/dtd_preparse.l @@ -54,6 +54,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <glib.h> #include <string.h> #include <errno.h> diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c index 0968212cde..606eadc148 100644 --- a/tools/lemon/lemon.c +++ b/tools/lemon/lemon.c @@ -28,6 +28,10 @@ ** Updated to sqlite lemon version 1.59 ** $Id$ */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <stdio.h> #include <stdarg.h> #include <stdlib.h> |