diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-18 19:13:46 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-18 19:13:46 +0000 |
| commit | ece65888763dc0e3b3db929c86c2edfb87b5515a (patch) | |
| tree | 41bb9cc04e2411cf898e9554c45d93fc27868723 /navit/intl_cmake | |
| parent | ab97c3774f3428f8182dcafa720cd51a2e8325f8 (diff) | |
| download | navit-svn-ece65888763dc0e3b3db929c86c2edfb87b5515a.tar.gz | |
Fix:core:Fixed a ton of "alloca redefined" warnings
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4361 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/intl_cmake')
| -rw-r--r-- | navit/intl_cmake/dcigettext.c | 3 | ||||
| -rw-r--r-- | navit/intl_cmake/loadmsgcat.c | 2 | ||||
| -rw-r--r-- | navit/intl_cmake/localealias.c | 2 | ||||
| -rw-r--r-- | navit/intl_cmake/printf.c | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/navit/intl_cmake/dcigettext.c b/navit/intl_cmake/dcigettext.c index 35238e2c..9d4e3542 100644 --- a/navit/intl_cmake/dcigettext.c +++ b/navit/intl_cmake/dcigettext.c @@ -27,9 +27,11 @@ # include <config.h> #endif +#include <stdlib.h> #include <sys/types.h> #ifdef __GNUC__ +# undef alloca # define alloca __builtin_alloca # define HAVE_ALLOCA 1 #else @@ -60,7 +62,6 @@ extern int errno; #endif #include <stddef.h> -#include <stdlib.h> #include <string.h> #if defined HAVE_UNISTD_H || defined _LIBC diff --git a/navit/intl_cmake/loadmsgcat.c b/navit/intl_cmake/loadmsgcat.c index fd060b70..55208667 100644 --- a/navit/intl_cmake/loadmsgcat.c +++ b/navit/intl_cmake/loadmsgcat.c @@ -27,6 +27,7 @@ # include <config.h> #endif +#include <stdlib.h> #include <ctype.h> #include <errno.h> #include <fcntl.h> @@ -56,7 +57,6 @@ char *alloca (); # endif #endif -#include <stdlib.h> #if HAVE_STDINT_H #include <stdint.h> #endif diff --git a/navit/intl_cmake/localealias.c b/navit/intl_cmake/localealias.c index 2eaf8813..ee27649a 100644 --- a/navit/intl_cmake/localealias.c +++ b/navit/intl_cmake/localealias.c @@ -26,6 +26,7 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif +#include <stdlib.h> #include <ctype.h> #include <stdio.h> @@ -57,7 +58,6 @@ char *alloca (); # endif #endif -#include <stdlib.h> #include <string.h> #include "gettextP.h" diff --git a/navit/intl_cmake/printf.c b/navit/intl_cmake/printf.c index 878646c2..8e584013 100644 --- a/navit/intl_cmake/printf.c +++ b/navit/intl_cmake/printf.c @@ -21,7 +21,10 @@ # include <config.h> #endif +#include <stdlib.h> + #ifdef __GNUC__ +# undef alloca # define alloca __builtin_alloca # define HAVE_ALLOCA 1 #else @@ -47,7 +50,6 @@ char *alloca (); #if !HAVE_POSIX_PRINTF -#include <stdlib.h> #include <string.h> /* When building a DLL, we must export some functions. Note that because |