From: gnuite <gnuite@gmail.com>
Date: Mon, 9 Mar 2009 05:36:45 +0000 (+0000)
Subject: Changes required for compilation on Gregale.
X-Git-Tag: fremantle/3.0+alpha0~100
X-Git-Url: http://git.itanic.dy.fi/?p=maemo-mapper;a=commitdiff_plain;h=39b0799ba66649c4f2480bf1d449a6b0dfcd84db

Changes required for compilation on Gregale.


git-svn-id: svn+ssh://garage/var/lib/gforge/svnroot/maemo-mapper/trunk@250 6c538b50-5814-0410-93ad-8bdf4c0149d1
---

diff --git a/src/util.c b/src/util.c
index 4e91bd9..90fc2e3 100644
--- a/src/util.c
+++ b/src/util.c
@@ -962,6 +962,18 @@ void format_lat_lon(gdouble d_lat, gdouble d_lon, gchar* lat, gchar* lon)
 	}
 }
 
+/* Custom version of g_ascii_strtoll, since Gregale does not support
+ * GLIB 2.12. */
+gint64
+g_ascii_strtoll(const gchar *nptr, gchar **endptr, guint base)
+{
+    gchar *minus = g_strstr_len(nptr, "-", -1);
+    if(minus)
+        return -g_ascii_strtoull(minus + 1, endptr, base);
+    else
+        return g_ascii_strtoull(nptr, endptr, base);
+}
+
 #if 0
 struct t_case {
     gchar *fmt;
diff --git a/src/util.h b/src/util.h
index 18d0625..0debc11 100644
--- a/src/util.h
+++ b/src/util.h
@@ -56,4 +56,6 @@ void format_lat_lon(gdouble d_lat, gdouble d_lon, gchar* lat, gchar* lon);
 
 gboolean coord_system_check_lat_lon (gdouble lat, gdouble lon, gint *fallback_deg_format);
 
+guint64 g_ascii_strtoll(const gchar *nptr, gchar **endptr, guint base);
+
 #endif /* ifndef MAEMO_MAPPER_UTIL_H */