Patch for building obdgpslogger v0.16 (http://icculus.org/obdgpslogger/) with gpsd v3.9 and fltk v1.3.2.

obdgpslogger-gpsd3.9-fltk1.3.2.patch

diff --git src/gui/maindisplay.fl src/gui/maindisplay.fl
index 09be746..339bca4 100644
--- src/gui/maindisplay.fl
+++ src/gui/maindisplay.fl
@@ -30,8 +30,8 @@ decl {\#include "convertwindow.h"} {}
 decl {\#include "gpsdwizard.h"} {public
 } 
 
-decl {class obdconvertwindow;} {public
-} 
+#decl {class obdconvertwindow;} {public
+#} 
 
 decl {\#include "obdgui.h"} {public
 } 
@@ -252,7 +252,7 @@ if(0 < f.count())
       }
       Fl_Button convertbutton {
         label {Convert log  to ...}
-        callback {mConvertWindow->show();}
+#        callback {mConvertWindow->show();}
         private xywh {360 110 155 25}
       }
       Fl_Button gpsdwizardbutton {
@@ -264,10 +264,10 @@ if(0 < f.count())
     code {setUIRunning(UI_STOPPED);} {}
     code {mLogWindow = new OBDLogWindow();
 mLogWindow->hide();} {}
-    code {mConvertWindow = new obdconvertwindow(this);
-mConvertWindow->hide();
-// mLogWindow->append_stdout("Cookies out");
-// mLogWindow->append_stderr("Cookies err");} {}
+#    code {mConvertWindow = new obdconvertwindow(this);
+#mConvertWindow->hide();
+#// mLogWindow->append_stdout("Cookies out");
+#// mLogWindow->append_stderr("Cookies err");} {}
     code {reset_dials();} {}
     code {mGpsdWindow = new GPSDWizardWindow();
 mGpsdWindow->hide();} {}
@@ -280,7 +280,7 @@ mGpsdWindow->hide();} {}
   mLH = NULL;
 }
 delete mLogWindow;
-delete mConvertWindow;
+#delete mConvertWindow;
 delete mGpsdWindow;
 
 obd_freeConfig(configfile);} {}
@@ -379,7 +379,7 @@ if(NULL == mLH) {
   decl {enum ui_state mUIState;} {}
   decl {enum trip_state mTripState;} {}
   decl {OBDLogWindow *mLogWindow;} {}
-  decl {obdconvertwindow *mConvertWindow;} {}
+#  decl {obdconvertwindow *mConvertWindow;} {}
   decl {GPSDWizardWindow *mGpsdWindow;} {}
   decl {struct OBDGPSConfig *configfile;} {public
   }
diff --git src/logger/gpscomm.c src/logger/gpscomm.c
index 6aebbe3..9550c9a 100644
--- src/logger/gpscomm.c
+++ src/logger/gpscomm.c
@@ -26,7 +26,8 @@ along with obdgpslogger.  If not, see <http://www.gnu.org/licenses/>.
 #include <gps.h>
 
 struct gps_data_t *opengps(char *server, char *port) {
-	struct gps_data_t *g = gps_open(server,port);
+	struct gps_data_t *g;
+	gps_open(server,port,g);
 	if(NULL == g)
 		return NULL;
 
@@ -58,7 +59,7 @@ int getgpsposition(struct gps_data_t *g, double *lat, double *lon, double *alt,
 		count = select(g->gps_fd + 1, &fds, NULL, NULL, &timeout);
 		if(count > 0) {
 #ifdef HAVE_GPSD_V3
-			gps_poll(g);
+			gps_read(g);
 #else
 			gps_query(g, "o");
 #endif //HAVE_GPSD_V3