diff options
| -rw-r--r-- | libgps.h | 2 | ||||
| -rw-r--r-- | libgps_core.c | 2 | ||||
| -rw-r--r-- | libgps_dbus.c | 4 | ||||
| -rw-r--r-- | libgps_shm.c | 4 | ||||
| -rw-r--r-- | libgps_sock.c | 4 |
5 files changed, 8 insertions, 8 deletions
@@ -8,7 +8,7 @@ /* * first member of each kind of privdata structure must be named - * 'export' and must be of this time. It's how we do runtime + * 'export_type' and must be of this time. It's how we do runtime * dispatch to the different transports. */ enum export_t {sockets, shm, dbus}; diff --git a/libgps_core.c b/libgps_core.c index b2e298d9..fee8985e 100644 --- a/libgps_core.c +++ b/libgps_core.c @@ -25,7 +25,7 @@ */ struct privdata_t { - enum export_t export; + enum export_t export_type; }; #define PRIVATE(gpsdata) ((struct privdata_t *)gpsdata->privdata) diff --git a/libgps_dbus.c b/libgps_dbus.c index 21ea129f..0cbb74a1 100644 --- a/libgps_dbus.c +++ b/libgps_dbus.c @@ -20,7 +20,7 @@ struct privdata_t { - enum export_t export; + enum export_t export_type; void (*handler)(struct gps_data_t *); }; #define PRIVATE(gpsdata) ((struct privdata_t *)(gpsdata)->privdata) @@ -125,7 +125,7 @@ int gps_dbus_open(struct gps_data_t *gpsdata) return 5; } - PRIVATE(gpsdata)->export = dbus; + PRIVATE(gpsdata)->export_type = dbus; share_gpsdata = gpsdata; return 0; } diff --git a/libgps_shm.c b/libgps_shm.c index a541a53a..60558ec1 100644 --- a/libgps_shm.c +++ b/libgps_shm.c @@ -29,7 +29,7 @@ PERMISSIONS struct privdata_t { - enum export_t export; + enum export_t export_type; void *shmseg; }; #define PRIVATE(gpsdata) ((struct privdata_t *)(gpsdata)->privdata) @@ -62,7 +62,7 @@ int gps_shm_open(/*@out@*/struct gps_data_t *gpsdata) #else gpsdata->gps_fd = (void *)(intptr_t)-1; #endif /* USE_QT */ - PRIVATE(gpsdata)->export = shm; + PRIVATE(gpsdata)->export_type = shm; return 0; } 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; |