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 4e91bd9f25648b6e7f79f0ce1e379dc21c9b5b1a..90fc2e37b49382cca82203e3c59d3979444a256d 100644 (file)
--- 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;
 #if 0
 struct t_case {
     gchar *fmt;

diff --git a/src/util.h b/src/util.h
index 18d06252a84c4da0e2d462582724073478ceaa22..0debc11bc7d5053010168a637359c88605e602a4 100644 (file)
--- 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);
 
 
 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 */
 #endif /* ifndef MAEMO_MAPPER_UTIL_H */