summaryrefslogtreecommitdiff
path: root/libgps_sock.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2011-09-28 03:44:33 -0400
committerEric S. Raymond <esr@thyrsus.com>2011-09-28 03:44:33 -0400
commitaf7ae8196bdb7fa2f4319b10c316f60323a43b8d (patch)
tree7ff2700d21743d9394de1d1201f93cbc417b8b0b /libgps_sock.c
parent45b6da360af526817cba737bc3b13ad6e24ee26b (diff)
downloadgpsd-af7ae8196bdb7fa2f4319b10c316f60323a43b8d.tar.gz
Avoid a name collision.
Diffstat (limited to 'libgps_sock.c')
-rw-r--r--libgps_sock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libgps_sock.c b/libgps_sock.c
index 0c2347e4..220dfb62 100644
--- a/libgps_sock.c
+++ b/libgps_sock.c
@@ -41,7 +41,7 @@ extern char *strtok_r(char *, const char *, char **);
struct privdata_t
{
- enum export_t export;
+ enum export_t export_type;
bool newstyle;
/* data buffered from the last read */
ssize_t waiting;
@@ -86,7 +86,7 @@ int gps_sock_open(/*@null@*/const char *host, /*@null@*/const char *port,
gpsdata->privdata = (void *)malloc(sizeof(struct privdata_t));
if (gpsdata->privdata == NULL)
return -1;
- PRIVATE(gpsdata)->export = sockets;
+ PRIVATE(gpsdata)->export_type = sockets;
PRIVATE(gpsdata)->newstyle = false;
PRIVATE(gpsdata)->waiting = 0;