Use globaly set _GNU_SOURCE

diff --git a/configure.ac b/configure.ac
index e5c62acf6f0d71def557f3f30d0fee81d18468aa..09aaae504aadce0a6e76b8b681ac8fd9030e0789 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,12 @@ AC_PROG_CPP
 AC_CONFIG_HEADERS(src/config.h)
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
-AC_SYS_LARGEFILE
+# AC_SYS_LARGEFILE
 # ^That should do it but for some reason it won't so hack it:
-CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
+# CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
+
+AC_DEFINE(_FILE_OFFSET_BITS, 64, [Enable LFS])
+AC_DEFINE(_GNU_SOURCE, 1, [Enable GNU Extensions])
 
 dnl PKG_PROG_PKG_CONFIG
 
@@ -88,6 +91,8 @@ else
   AC_DEFINE([WITH_DEVICE_770], 1, [With 770/N800 specific code])
 fi
 
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+
 if test "x$enable_itbtdbus" = "xno" ; then
   WITH_HILDON_DBUS_BT=no
   enable_btdbus=yes

diff --git a/src/announcements.c b/src/announcements.c
index 625c4b529c6d644d5816c61889312113247d9e88..80b8ac76ed4aabca50469b7cb6ae6029caeafbd9 100644 (file)
--- a/src/announcements.c
+++ b/src/announcements.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#define _GNU_SOURCE
-
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <libintl.h>

diff --git a/src/announcements.h b/src/announcements.h
index 537d2e53e155610881f3ea8f24c00da3843d26a4..c0310853e5d0e7a2924cb41b1ea5fe9e747c7f0a 100644 (file)
--- a/src/announcements.h
+++ b/src/announcements.h
@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#define _GNU_SOURCE
-
 #include <glib/gstdio.h>
 
 void announce_distance_to_destination(gdouble distance, gchar *unit, gdouble climit);

diff --git a/src/bt-bluez.c b/src/bt-bluez.c
index 845dcb8e6781bf6f5981097b6c2dea7fb855aeca..9b124bdb2630ddd198b29580ed108eed728e2739 100644 (file)
--- a/src/bt-bluez.c
+++ b/src/bt-bluez.c
@@ -1,5 +1,3 @@
-#define _GNU_SOURCE
-
 #include <config.h>
 
 /* XXX: well, we are not using dbus yet, but anyway.. */

diff --git a/src/bt-maemo.c b/src/bt-maemo.c
index c216a214604d5be06a0df23ab0000beb4ff5af48..c01e1cda9c47892b3b283e8c90c7c9e07a757b02 100644 (file)
--- a/src/bt-maemo.c
+++ b/src/bt-maemo.c
@@ -25,8 +25,6 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #ifdef WITH_HILDON_DBUS_BT
 
 #include <fcntl.h>

diff --git a/src/bt.h b/src/bt.h
index 11d732c2d4dcd9f95f8ae4e52d53f36c6c6d1a01..635de121e42a89c9ab13a11624997d07a2b72d6b 100644 (file)
--- a/src/bt.h
+++ b/src/bt.h
@@ -1,7 +1,7 @@
 #ifndef _MAPPER_BT_H
 #define _MAPPER_BT_H
 
-#define _GNU_SOURCE
+#include "config.h"
 
 #include <dbus/dbus-glib.h>
 

diff --git a/src/cb.c b/src/cb.c
index 85aa881955639a827fa37839864bbb879f73beef..f4244dc38c0ae9cc79f7ed198dd6ee650ffe0aab 100644 (file)
--- a/src/cb.c
+++ b/src/cb.c
@@ -25,8 +25,6 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/cb.h b/src/cb.h
index 89beba777f551c1b74dc527a54839c60925a053f..07305af0d0737912d328387167e15f2a41d4b1f2 100644 (file)
--- a/src/cb.h
+++ b/src/cb.h
@@ -3,8 +3,6 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <gtk/gtk.h>
 
 gboolean window_cb_key_press(GtkWidget * widget, GdkEventKey * event);

diff --git a/src/config-gconf.c b/src/config-gconf.c
index 71dfa1b209d9833b1866a2448df1760da66041b1..63d79f5f94b577dc955f63f902db79592d6008fa 100644 (file)
--- a/src/config-gconf.c
+++ b/src/config-gconf.c
@@ -25,8 +25,6 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/file.c b/src/file.c
index 6a46073c5d6e95c818981588e38fecf271461cdb..68bf5b8f9c747501d7c48a208ca9ac37aee57e33 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -23,8 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-
 #include <config.h>
 #include <gtk/gtk.h>
 #include <libgnomevfs/gnome-vfs.h>

diff --git a/src/filter-gui.c b/src/filter-gui.c
index a6eb2eaa045c8c7323968b8655dfade0a2888a82..4c034b859620355f92ff2d92426d8b5fcbeacbd0 100644 (file)
--- a/src/filter-gui.c
+++ b/src/filter-gui.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/gps-browse.c b/src/gps-browse.c
index 85934fd19723b14e1727f7f38bc5b5c1261b63d6..e6f817812b1e78a2b40552f0256d52f41cb6c259 100644 (file)
--- a/src/gps-browse.c
+++ b/src/gps-browse.c
@@ -23,8 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-
 #include <config.h>
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/src/gps-conn.c b/src/gps-conn.c
index fb5d563c41d9344162e33b3b20df48704fddd8a1..5f0b874477a07d1d038b5d8731a22399be13b7cb 100644 (file)
--- a/src/gps-conn.c
+++ b/src/gps-conn.c
@@ -23,8 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-
 #include <config.h>
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/src/gps-nmea-parse.c b/src/gps-nmea-parse.c
index ec2faa2527fbd36913a14f2621311b26ce103d2b..6aaf3b27b232ff5b55d44dd050f3c12f51201fa5 100644 (file)
--- a/src/gps-nmea-parse.c
+++ b/src/gps-nmea-parse.c
@@ -23,8 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-
 #include <config.h>
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/src/gps-panels.c b/src/gps-panels.c
index a614e69f7fa8aaaf91a32b20056489413e0a4fc2..9e99aadd81a6d5bc71a86e11d05232ec6f7a7248 100644 (file)
--- a/src/gps-panels.c
+++ b/src/gps-panels.c
@@ -25,8 +25,6 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/gps.h b/src/gps.h
index f30e73f69a6e095f09e420b7ae82e8f95e0bf98b..b9c36034b77ab256298f3684bf3ad22974f0f040 100644 (file)
--- a/src/gps.h
+++ b/src/gps.h
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #ifndef _MAPPER_GPS_H
 #define _MAPPER_GPS_H
 

diff --git a/src/gpx.c b/src/gpx.c
index 0f96859b84d4059f50a990518741e9128177e3b8..7a2d24d9027fac24096a7fd547cb41a5e490d364 100644 (file)
--- a/src/gpx.c
+++ b/src/gpx.c
@@ -22,8 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-
 #include <config.h>
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/src/hildon-wrappers.c b/src/hildon-wrappers.c
index 635005f6d98cf407e27f3bc75222cd439dea08a5..f44fe038593fa43bced7d0a6dd8a017863c11711 100644 (file)
--- a/src/hildon-wrappers.c
+++ b/src/hildon-wrappers.c
@@ -24,8 +24,6 @@
 /****************************************************************************
  * Hildon function Wrappers for non-hildon build
  ****************************************************************************/
-#define _GNU_SOURCE
-
 #include "config.h"
 
 #include <gtk/gtk.h>

diff --git a/src/latlon.c b/src/latlon.c
index a73d6800303200d7509ef6c71d2d9a798611a179..49d490e71a93a94dbca0a3e84a98a57dc433dd7b 100644 (file)
--- a/src/latlon.c
+++ b/src/latlon.c
@@ -26,7 +26,7 @@
  * Different Lat/Lon and related functions
  * (conversion, distances, etc)
  */
-#define _GNU_SOURCE
+#include "config.h"
 
 #include <math.h>
 #include <glib.h>

diff --git a/src/maemo-osso.c b/src/maemo-osso.c
index 2e00c322354253331abe8182568138d352f40d78..203cd88903d3245d6c57358bf70e006fc2ea5202 100644 (file)
--- a/src/maemo-osso.c
+++ b/src/maemo-osso.c
@@ -29,8 +29,6 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <glib.h>
 #include <gtk/gtk.h>
 

diff --git a/src/map-download.c b/src/map-download.c
index a7130211e53680249d7d6cb49abb2cc05ae69435..f1cac2baa6385ccb8b9d81daa53fd5c13affc38c 100644 (file)
--- a/src/map-download.c
+++ b/src/map-download.c
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/map-poi.c b/src/map-poi.c
index a0327a6d83c32f99061ef9196eca96c6c341f4ec..b6b4cca34fb11d46a1653a921629ea217275881f 100644 (file)
--- a/src/map-poi.c
+++ b/src/map-poi.c
@@ -25,8 +25,6 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <gtk/gtk.h>
 
 #include "utils.h"

diff --git a/src/map-repo.c b/src/map-repo.c
index 8339a11b74a45e419e74b1e69d96a99bd969d298..81644521bf0857e8a47c6b3cfe9cd22f6800040a 100644 (file)
--- a/src/map-repo.c
+++ b/src/map-repo.c
@@ -25,8 +25,6 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/map.c b/src/map.c
index e1a779c3e074f549a07214f622ec78dfbe9a5cb0..ab984d7933b23176d34cb986a96b15e07eab588d 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -25,8 +25,6 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/map.h b/src/map.h
index 6c6b597df3a3a125a148d1d3fc7796d979ac0f2f..6a83acb4d4990da5bb6bae8ec4355054f06b45e1 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #ifndef _MAPPER_MAP_H
 #define _MAPPER_MAP_H
 

diff --git a/src/mapper-types.h b/src/mapper-types.h
index e4fdec04c917039955a32730ae4cc7ca99ed39e9..fd6b391b74b9551e82d6eb87354e3e58a2a2c6ee 100644 (file)
--- a/src/mapper-types.h
+++ b/src/mapper-types.h
@@ -1,7 +1,5 @@
 #include "config.h"
 
-#define _GNU_SOURCE
-
 #include <math.h>
 #include <gtk/gtk.h>
 

diff --git a/src/mapper.c b/src/mapper.c
index d6e2177a8eb448832b3591cce15d623d1a5f3445..b285c0cbab5ae50c57d7180a6ab5295da0223a80 100644 (file)
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -23,8 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-
 #include <config.h>
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/src/osm-db.c b/src/osm-db.c
index 187263d0a8a144b4ea4335a61f93fc9f6aaf3002..e080b404b053da80bb9b1dc69d66b52d9daf856e 100644 (file)
--- a/src/osm-db.c
+++ b/src/osm-db.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#define _GNU_SOURCE
+#include "config.h"
 
 #include <unistd.h>
 #include <string.h>

diff --git a/src/osm.c b/src/osm.c
index 03723a4ba36949fa35a379c0cee661b364cdc1e9..5d585d106d55aa496b0247006bff3e480aa6dbc1 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -33,8 +33,6 @@
  *
  */
 
-#define _GNU_SOURCE
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>

diff --git a/src/poi-gui.c b/src/poi-gui.c
index 37abe849c3b9b079136132a48b6ee9b7042aab41..32b6a58d5c5ab76df51f324787b075a985e15612 100644 (file)
--- a/src/poi-gui.c
+++ b/src/poi-gui.c
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/poi.c b/src/poi.c
index 3465f86fbc349cae1cc5cf23c1ed2c0c2f80b180..f87d7763c838dd251830b0ccc15895bd640f47d3 100644 (file)
--- a/src/poi.c
+++ b/src/poi.c
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/route.c b/src/route.c
index 33a1b6bda9b54280299666aa1d97b17cd74822a1..26c30a00105aebba662afa8ba247adb1f9f8b2c3 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/route.h b/src/route.h
index fbfd923114d7272833bdf76b1934551b028924b8..66f2acb1c2c16a62d969b3dea36b02f19326e536 100644 (file)
--- a/src/route.h
+++ b/src/route.h
@@ -1,6 +1,4 @@
-#include <config.h>
-
-#define _GNU_SOURCE
+#include "config.h"
 
 #ifndef _MAPPER_ROUTE_H
 #define _MAPPER_ROUTE_H

diff --git a/src/search.c b/src/search.c
index 1229154546fab76e64fa38ad9a1ecb5397579194..69965ede2aaa958e828b8aa29dab5910245090f8 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -24,8 +24,6 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/settings-gui.c b/src/settings-gui.c
index dc6d73493f4cbc0612a420be9692b466b4d54207..14caacb6b86ec1eefd3d70d5948434dd6b70f031 100644 (file)
--- a/src/settings-gui.c
+++ b/src/settings-gui.c
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/settings.h b/src/settings.h
index a249ac594baf23d742c376a6f92ca9f0477f1fb2..fcb0ab0f9756c3f9ebe661c74fd8565450eabee2 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,7 +1,5 @@
 #include "config.h"
 
-#define _GNU_SOURCE
-
 #include <glib.h>
 
 #ifndef _MAPPER_SETTINGS_H

diff --git a/src/speed-display.c b/src/speed-display.c
index cd90b14582cb8038e086a0f20cf3dc8957fa2321..dbb4eb024fac64941d2abfa67232d21c85521ea7 100644 (file)
--- a/src/speed-display.c
+++ b/src/speed-display.c
@@ -1,7 +1,5 @@
 #include "config.h"
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/ui-common.c b/src/ui-common.c
index f051ddb4a510f0705feda2cebd7cb7c3ef3d1117..0ea0f2410ab5b8405351d6e5c3903eaa26fe4f9c 100644 (file)
--- a/src/ui-common.c
+++ b/src/ui-common.c
@@ -1,7 +1,5 @@
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/ui-common.h b/src/ui-common.h
index 5ced54439d6ad9659a26d679cb635ebfe8562d5e..b0adddf9d446ded65a400950aa870c941a98bed3 100644 (file)
--- a/src/ui-common.h
+++ b/src/ui-common.h
@@ -1,9 +1,7 @@
 #ifndef _MAPPER_UI_COMMON_H
 #define _MAPPER_UI_COMMON_H
 
-#include <config.h>
-
-#define _GNU_SOURCE
+#include "config.h"
 
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/src/utils.c b/src/utils.c
index 0a690ea1071bb3d4b0c2139d25e1f03d5b61b3c1..65bb75657b2a59e799a88dc18b622ebe10ec0b20 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,5 +1,3 @@
-#define _GNU_SOURCE
-
 #include <config.h>
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/src/utils.h b/src/utils.h
index a0ae6976bc9d7dde8457d2481f172c35c34f8bf8..9e9236b622386f376d5803fda9cc1eb3781e3e90 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -21,9 +21,7 @@
 #ifndef _MAPPER_UTILS_H
 #define _MAPPER_UTILS_H
 
-#define _GNU_SOURCE
-
-#include <config.h>
+#include "config.h"
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>