Fix:core:Fixed a ton of "alloca redefined" warnings

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4361 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/android.c b/navit/navit/android.c
index 26262b8..4cb1b6d 100644 (file)
--- a/navit/navit/android.c
+++ b/navit/navit/android.c
@@ -1,7 +1,7 @@
+#include <stdlib.h>
 #include <string.h>
 #include <poll.h>
 #include <glib.h>
-#include <stdlib.h>
 #include "android.h"
 #include <android/log.h>
 #include "navit.h"

diff --git a/navit/navit/bookmarks.c b/navit/navit/bookmarks.c
index 80e27b4..c5f040c 100644 (file)
--- a/navit/navit/bookmarks.c
+++ b/navit/navit/bookmarks.c
@@ -17,8 +17,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include <glib.h>
 #include <stdlib.h>
+#include <glib.h>
 #include <stdio.h>
 #include "config.h"
 #ifdef HAVE_UNISTD_H

diff --git a/navit/navit/coord.c b/navit/navit/coord.c
index e77bd5e..39cd513 100644 (file)
--- a/navit/navit/coord.c
+++ b/navit/navit/coord.c
@@ -17,9 +17,9 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#include <stdlib.h>
 #include <glib.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include "debug.h"

diff --git a/navit/navit/graphics.c b/navit/navit/graphics.c
index ae0e39a..95a57fa 100644 (file)
--- a/navit/navit/graphics.c
+++ b/navit/navit/graphics.c
@@ -26,9 +26,9 @@
 //#
 //##############################################################################################################
 
+#include <stdlib.h>
 #include <glib.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <math.h>
 #include "config.h"
 #include "debug.h"

diff --git a/navit/navit/graphics/android/graphics_android.c b/navit/navit/graphics/android/graphics_android.c
index 530e229..3da9371 100644 (file)
--- a/navit/navit/graphics/android/graphics_android.c
+++ b/navit/navit/graphics/android/graphics_android.c
@@ -17,8 +17,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include <glib.h>
 #include <unistd.h>
+#include <glib.h>
 #include "config.h"
 #include "window.h"
 #include "point.h"

diff --git a/navit/navit/intl_cmake/dcigettext.c b/navit/navit/intl_cmake/dcigettext.c
index 35238e2..9d4e354 100644 (file)
--- a/navit/navit/intl_cmake/dcigettext.c
+++ b/navit/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/navit/intl_cmake/loadmsgcat.c b/navit/navit/intl_cmake/loadmsgcat.c
index fd060b7..5520866 100644 (file)
--- a/navit/navit/intl_cmake/loadmsgcat.c
+++ b/navit/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/navit/intl_cmake/localealias.c b/navit/navit/intl_cmake/localealias.c
index 2eaf881..ee27649 100644 (file)
--- a/navit/navit/intl_cmake/localealias.c
+++ b/navit/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/navit/intl_cmake/printf.c b/navit/navit/intl_cmake/printf.c
index 878646c..8e58401 100644 (file)
--- a/navit/navit/intl_cmake/printf.c
+++ b/navit/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

diff --git a/navit/navit/map/binfile/binfile.c b/navit/navit/map/binfile/binfile.c
index 7cec3eb..9facd70 100644 (file)
--- a/navit/navit/map/binfile/binfile.c
+++ b/navit/navit/map/binfile/binfile.c
@@ -17,8 +17,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include <glib.h>
 #include <stdlib.h>
+#include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

diff --git a/navit/navit/map/csv/quadtree.c b/navit/navit/map/csv/quadtree.c
index d5396d8..1d1460f 100644 (file)
--- a/navit/navit/map/csv/quadtree.c
+++ b/navit/navit/map/csv/quadtree.c
@@ -1,8 +1,9 @@
-#include "quadtree.h"
 
 #include <stdlib.h>
 #include <glib.h>
 
+#include "quadtree.h"
+
 #define QUADTREE_NODE_CAPACITY 10
 
 #define MAX_DOUBLE 9999999

diff --git a/navit/navit/map/filter/filter.c b/navit/navit/map/filter/filter.c
index abfbd6c..edc6a84 100644 (file)
--- a/navit/navit/map/filter/filter.c
+++ b/navit/navit/map/filter/filter.c
@@ -17,8 +17,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include <glib.h>
 #include <stdlib.h>
+#include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

diff --git a/navit/navit/map/shapefile/shapefile.c b/navit/navit/map/shapefile/shapefile.c
index 8206e90..03f223c 100644 (file)
--- a/navit/navit/map/shapefile/shapefile.c
+++ b/navit/navit/map/shapefile/shapefile.c
@@ -17,8 +17,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include <glib.h>
 #include <stdlib.h>
+#include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

diff --git a/navit/navit/maptool/maptool.c b/navit/navit/maptool/maptool.c
index 3ff11c4..5ba7d65 100644 (file)
--- a/navit/navit/maptool/maptool.c
+++ b/navit/navit/maptool/maptool.c
@@ -21,11 +21,11 @@
 #define _FILE_OFFSET_BITS 64
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
+#include <stdlib.h>
 #include <glib.h>
 #include <assert.h>
 #include <string.h>
 #include <signal.h>
-#include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
 #include <getopt.h>

diff --git a/navit/navit/maptool/misc.c b/navit/navit/maptool/misc.c
index edfa92f..ba2db1e 100644 (file)
--- a/navit/navit/maptool/misc.c
+++ b/navit/navit/maptool/misc.c
@@ -21,11 +21,11 @@
 #define _FILE_OFFSET_BITS 64
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
+#include <stdlib.h>
 #include <glib.h>
 #include <assert.h>
 #include <string.h>
 #include <signal.h>
-#include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
 #include <getopt.h>

diff --git a/navit/navit/maptool/osm.c b/navit/navit/maptool/osm.c
index dff165e..1d80ac3 100644 (file)
--- a/navit/navit/maptool/osm.c
+++ b/navit/navit/maptool/osm.c
@@ -1,7 +1,7 @@
+#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-#include <unistd.h>
 #include "maptool.h"
 #include "debug.h"
 #include "linguistics.h"

diff --git a/navit/navit/maptool/tile.c b/navit/navit/maptool/tile.c
index 3eeff52..777790f 100644 (file)
--- a/navit/navit/maptool/tile.c
+++ b/navit/navit/maptool/tile.c
@@ -21,11 +21,11 @@
 #define _FILE_OFFSET_BITS 64
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
+#include <stdlib.h>
 #include <glib.h>
 #include <assert.h>
 #include <string.h>
 #include <signal.h>
-#include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
 #include <getopt.h>

diff --git a/navit/navit/osd/core/osd_core.c b/navit/navit/osd/core/osd_core.c
index 2c081a0..b9fa549 100644 (file)
--- a/navit/navit/osd/core/osd_core.c
+++ b/navit/navit/osd/core/osd_core.c
@@ -21,6 +21,7 @@
 #ifdef _MSC_VER
 #define _USE_MATH_DEFINES 1
 #endif /* _MSC_VER */
+#include <stdlib.h>
 #include <math.h>
 #include <stdio.h>
 #include <glib.h>
@@ -28,7 +29,6 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
-#include <stdlib.h>
 #include <string.h>
 #include "item.h"
 #include "point.h"

diff --git a/navit/navit/search.c b/navit/navit/search.c
index d292ca4..10a8ea9 100644 (file)
--- a/navit/navit/search.c
+++ b/navit/navit/search.c
@@ -17,9 +17,9 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#include <stdlib.h>
 #include <glib.h>
 #include <string.h>
-#include <stdlib.h>
 #include <math.h>
 #include "debug.h"
 #include "projection.h"

diff --git a/navit/navit/util.c b/navit/navit/util.c
index b5a94ec..9080d11 100644 (file)
--- a/navit/navit/util.c
+++ b/navit/navit/util.c
@@ -17,9 +17,9 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#include <stdlib.h>
 #include <glib.h>
 #include <ctype.h>
-#include <stdlib.h>
 #include <stdarg.h>
 #include <time.h>
 #include <limits.h>

diff --git a/navit/navit/vehicleprofile.c b/navit/navit/vehicleprofile.c
index 92880ac..63eb40d 100644 (file)
--- a/navit/navit/vehicleprofile.c
+++ b/navit/navit/vehicleprofile.c
@@ -17,9 +17,9 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#include <stdlib.h>
 #include <glib.h>
 #include <string.h>
-#include <stdlib.h>
 #include "debug.h"
 #include "item.h"
 #include "roadprofile.h"

diff --git a/navit/navit/xmlconfig.c b/navit/navit/xmlconfig.c
index 4fbe38f..abf909e 100644 (file)
--- a/navit/navit/xmlconfig.c
+++ b/navit/navit/xmlconfig.c
@@ -21,11 +21,11 @@
  * for details on how the xml file parser works.
  */
 
+#include <stdlib.h>
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
 #include "debug.h"
 #include "config.h"
 #include "file.h"