summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2004-09-29 15:57:33 +0000
committerEric S. Raymond <esr@thyrsus.com>2004-09-29 15:57:33 +0000
commit3370041ba595fa44aa9500ebc7688120ad401f85 (patch)
treee9ff792cc631266759118d9caabcbb45848274b9
parentac41f8185e7a33c887ce8871353b37b2e05df3bb (diff)
downloadgpsd-3370041ba595fa44aa9500ebc7688120ad401f85.tar.gz
Only declare /dev/gps once.
-rw-r--r--gpsd.c1
-rw-r--r--gpsd.h2
-rw-r--r--libgpsd_core.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/gpsd.c b/gpsd.c
index b8e2e3c1..68b19128 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -50,7 +50,6 @@
#include "gpsd.h"
#define QLEN 5
-#define DEFAULT_DEVICE_NAME "/dev/gps"
/* the default driver is NMEA */
struct gps_session_t *session;
diff --git a/gpsd.h b/gpsd.h
index d4957726..13d4244e 100644
--- a/gpsd.h
+++ b/gpsd.h
@@ -108,5 +108,7 @@ extern void gpsd_wrap(struct gps_session_t *session);
/* caller must supply this */
void gpsd_report(int d, const char *fmt, ...);
+#define DEFAULT_DEVICE_NAME "/dev/gps"
+
diff --git a/libgpsd_core.c b/libgpsd_core.c
index 8922422c..c096eab2 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -39,7 +39,7 @@ struct gps_session_t *gpsd_init(char devicetype, char *dgpsserver)
if (!session)
return NULL;
- session->gpsd_device = "/dev/gps";
+ session->gpsd_device = DEFAULT_DEVICE_NAME;
session->device_type = gpsd_drivers[0];
#ifdef NON_NMEA_ENABLE
{