Build fixes

diff --git a/src/mapper-types.h b/src/mapper-types.h
index d80aa6860ff15e34c8f414757565d2ca53901f51..0128c5ab3f9a0dbf263509b1cb320edc97a95cc4 100644 (file)
--- a/src/mapper-types.h
+++ b/src/mapper-types.h
@@ -3,6 +3,7 @@
 #define _GNU_SOURCE
 
 #include <math.h>
+#include <gtk/gtk.h>
 
 #ifndef _MAPPER_TYPES_H
 #define _MAPPER_TYPES_H

diff --git a/src/route.c b/src/route.c
index f5636f7f51b8cc307bf13683f6bd4e1602def54a..ba29e241b15eb052ab9c617d50c80e7399781bc4 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -29,6 +29,7 @@
 #include "latlon.h"
 #include "map.h"
 #include "map-download.h"
+#include "iap.h"
 
 void route_find_nearest_point();
 void cancel_autoroute(gboolean temporary);
@@ -231,11 +232,7 @@ if (!_curl_multi) {
 }
 curl_multi_add_handle(_curl_multi, _autoroute_data.curl_easy);
 
-#ifdef WITH_OSSO
 if (iap_is_connected() && !_curl_sid)
-#else
-if (!_curl_sid)
-#endif
        _curl_sid = g_timeout_add(100, (GSourceFunc) map_download_timeout, NULL);
 
 _autoroute_data.in_progress = TRUE;
@@ -265,9 +262,7 @@ OriginToggleInfo oti;
 GtkEntryCompletion *from_comp;
 GtkEntryCompletion *to_comp;
 
-#ifdef WITH_OSSO
 iap_connect();
-#endif
 
 dialog = gtk_dialog_new_with_buttons(_("Download Route"),
                             GTK_WINDOW(_window),