diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-07-01 22:34:40 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-07-01 22:34:40 +0000 |
| commit | 230f13ea8ae61f082029b7af2cc9e12f8c3c626f (patch) | |
| tree | 222fd82f10f7bc40eddf61c508e7977af1b7b715 /navit/vehicle/gpsd/vehicle_gpsd.c | |
| parent | 1649ca2a6fadb314c2fc829913fab075980938cb (diff) | |
| download | navit-230f13ea8ae61f082029b7af2cc9e12f8c3c626f.tar.gz | |
Fix:vehicle_gpsd:Enable gpsd_query for libgps16
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4569 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/vehicle/gpsd/vehicle_gpsd.c')
| -rw-r--r-- | navit/vehicle/gpsd/vehicle_gpsd.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/navit/vehicle/gpsd/vehicle_gpsd.c b/navit/vehicle/gpsd/vehicle_gpsd.c index 01ae519e6..52c24bdde 100644 --- a/navit/vehicle/gpsd/vehicle_gpsd.c +++ b/navit/vehicle/gpsd/vehicle_gpsd.c @@ -36,9 +36,7 @@ static struct vehicle_priv { char *source; -#ifndef HAVE_LIBGPS19 char *gpsd_query; -#endif struct callback_list *cbl; struct callback *cb; struct event_watch *evwatch; @@ -334,10 +332,8 @@ vehicle_gpsd_destroy(struct vehicle_priv *priv) vehicle_gpsd_close(priv); if (priv->source) g_free(priv->source); -#ifndef HAVE_LIBGPS19 if (priv->gpsd_query) g_free(priv->gpsd_query); -#endif #if GPSD_API_MAJOR_VERSION >= 5 g_free(priv->gps); #endif @@ -421,11 +417,7 @@ vehicle_gpsd_new_gpsd(struct vehicle_methods *cbl, struct attr **attrs) { struct vehicle_priv *ret; -#ifdef HAVE_LIBGPS19 - struct attr *source, *retry_int; -#else struct attr *source, *query, *retry_int; -#endif dbg(1, "enter\n"); source = attr_search(attrs, NULL, attr_source); @@ -434,7 +426,6 @@ vehicle_gpsd_new_gpsd(struct vehicle_methods ret->gps = g_new0(struct gps_data_t, 1); #endif ret->source = g_strdup(source->u.str); -#ifndef HAVE_LIBGPS19 query = attr_search(attrs, NULL, attr_gpsd_query); if (query) { ret->gpsd_query = g_strconcat(query->u.str, "\n", NULL); @@ -442,7 +433,6 @@ vehicle_gpsd_new_gpsd(struct vehicle_methods ret->gpsd_query = g_strdup("w+x\n"); } dbg(1,"Format string for gpsd_query: %s\n",ret->gpsd_query); -#endif retry_int = attr_search(attrs, NULL, attr_retry_interval); if (retry_int) { ret->retry_interval = retry_int->u.num; |