Fix:core:Fix clang compiler warnings: wrong format specifier

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

diff --git a/navit/navit/maptool/maptool.h b/navit/navit/maptool/maptool.h
index 748b0cb..eaa731e 100644 (file)
--- a/navit/navit/maptool/maptool.h
+++ b/navit/navit/maptool/maptool.h
@@ -7,7 +7,7 @@
 #ifdef HAVE_API_WIN32_BASE
 #define LONGLONG_FMT "%I64d"
 #else
-#define LONGLONG_FMT "%Ld"
+#define LONGLONG_FMT "%lld"
 #endif
 
 #define BUFFER_SIZE 1280

diff --git a/navit/navit/maptool/osm.c b/navit/navit/maptool/osm.c
index 54172f7..7cfa94c 100644 (file)
--- a/navit/navit/maptool/osm.c
+++ b/navit/navit/maptool/osm.c
@@ -1408,7 +1408,7 @@ osm_add_member(int type, osmid ref, char *role)
        char member_buffer[BUFFER_SIZE*3+3];
        struct attr memberattr = { attr_osm_member };
 
-       sprintf(member_buffer,"%d:%Ld:%s", type, (long long) ref, role);
+       sprintf(member_buffer,"%d:"LONGLONG_FMT":%s", type, (long long) ref, role);
        memberattr.u.str=member_buffer;
        item_bin_add_attr(item_bin, &memberattr);
 }

diff --git a/navit/navit/types.h b/navit/navit/types.h
index 28701c5..1bba0f6 100644 (file)
--- a/navit/navit/types.h
+++ b/navit/navit/types.h
@@ -31,11 +31,7 @@ typedef uint32_t u32;
 #ifdef HAVE_API_WIN32_BASE
 #define LONGLONG_FMT "%I64d"
 #else
-#ifdef HAVE_API_ANDROID
 #define LONGLONG_FMT "%lld"
-#else
-#define LONGLONG_FMT "%Ld"
-#endif
 #endif