* Made compatible with new Debian autobuilder architecture.

[maemo-mapper] / src / gps.c

diff --git a/src/gps.c b/src/gps.c
index 4414ee63ba5330943c43b3c7cb8801d78aa614a7..82d06f87fcb385e9e3c181ed9f869d6d37ae100f 100644 (file)
--- a/src/gps.c
+++ b/src/gps.c
@@ -54,6 +54,10 @@
 #    include "gpsbt.h"
 #endif
 
+#ifdef HAVE_LIBGPSMGR
+#    include "gpsmgr.h"
+#endif
+
 #include "path.h"
 #include "util.h"
 
@@ -554,7 +558,10 @@ thread_read_nmea(GpsRcvrInfo *gri)
     GThread *my_thread = g_thread_self();
     gboolean error = FALSE;
 #ifdef HAVE_LIBGPSBT
-    gpsbt_t gps_context;
+    gpsbt_t gpsbt_context;
+#endif
+#ifdef HAVE_LIBGPSMGR
+    gpsmgr_t gpsmgr_context;
 #endif
     gboolean is_context = FALSE;
 
@@ -571,10 +578,10 @@ thread_read_nmea(GpsRcvrInfo *gri)
         {
             gchar errstr[BUFFER_SIZE] = "";
             /* We need to start gpsd (via gpsbt) first. */
-            memset(&gps_context, 0, sizeof(gps_context));
+            memset(&gpsbt_context, 0, sizeof(gpsbt_context));
             errno = 0;
             if(gpsbt_start(gri->bt_mac, 0, 0, 0, errstr, sizeof(errstr),
-                        0, &gps_context) < 0)
+                        0, &gpsbt_context) < 0)
             {
                 g_printerr("Error connecting to GPS receiver: (%d) %s (%s)\n",
                         errno, strerror(errno), errstr);
@@ -620,10 +627,10 @@ thread_read_nmea(GpsRcvrInfo *gri)
             if (!gpsd_ctrl_sock)
                 gpsd_ctrl_sock = "/tmp/.gpsd_ctrl_sock";
 
-            memset(&gps_context, 0, sizeof(gps_context));
+            memset(&gpsmgr_context, 0, sizeof(gpsmgr_context));
             errno = 0;
             if(gpsmgr_start(gpsd_prog, devs, gpsd_ctrl_sock,
-                        0, 0, &gps_context.mgr) < 0)
+                        0, 0, &gpsmgr_context) < 0)
             {
                 g_printerr("Error opening GPS device: (%d) %s\n",
                         errno, strerror(errno));
@@ -777,13 +784,13 @@ thread_read_nmea(GpsRcvrInfo *gri)
         {
 #ifdef HAVE_LIBGPSBT
             case GPS_RCVR_BT:
-                gpsbt_stop(&gps_context);
+                gpsbt_stop(&gpsbt_context);
                 break;
 #endif
 
 #ifdef HAVE_LIBGPSMGR
             case GPS_RCVR_FILE:
-                gpsmgr_stop(&gps_context.mgr);
+                gpsmgr_stop(&gpsmgr_context);
                 break;
 #endif