--- trunk/src/gpxview.h	2010/05/21 14:12:36	279
+++ trunk/src/gpxview.h	2010/05/21 19:28:16	280
@@ -51,7 +51,9 @@
 #include <locale.h>
 #include <libintl.h>
 
+#ifndef _
 #define _(String) gettext(String)
+#endif
 #define N_(String) (String)
 
 #ifdef USE_MAEMO
@@ -217,6 +219,7 @@
     int source;
     int zoom;
     pos_t pos;
+    gboolean dpix;
   } map;
 #endif