diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2012-05-02 03:30:22 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2012-05-02 03:30:22 -0400 |
| commit | 5fd42751fe91d8b104da325a961de769a36858b9 (patch) | |
| tree | 353ec410f1d11fb70eb97dce6ddcd5dcc7289b96 /libgpsd_core.c | |
| parent | 7d4ba24d9edca994e8c1e40d359ec9766def50a7 (diff) | |
| download | gpsd-5fd42751fe91d8b104da325a961de769a36858b9.tar.gz | |
Partial splint cleanup of NMEA2000 driver.
Diffstat (limited to 'libgpsd_core.c')
| -rw-r--r-- | libgpsd_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libgpsd_core.c b/libgpsd_core.c index 3d7a6aac..9444c86f 100644 --- a/libgpsd_core.c +++ b/libgpsd_core.c @@ -25,12 +25,12 @@ #endif /* S_SPLINT_S */ #include "gpsd.h" -#ifdef NMEA2000_ENABLE +#if defined(NMEA2000_ENABLE) && !defined(S_SPLINT_S) #include <linux/can.h> #include <linux/can/raw.h> #include <net/if.h> #include <sys/ioctl.h> -#endif /* NMEA2000_ENABLE */ +#endif /* defined(NMEA2000_ENABLE) && !defined(S_SPLINT_S) */ static void gpsd_run_device_hook(char *device_name, char *hook) { @@ -304,7 +304,7 @@ int gpsd_open(struct gps_device_t *session) return session->gpsdata.gps_fd; } #endif /* PASSTHROUGH_ENABLE */ -#ifdef NMEA2000_ENABLE +#if defined(NMEA2000_ENABLE) && !defined(S_SPLINT_S) if (strncmp(session->gpsdata.dev.path, "nmea2000://", 11) == 0) { char interface_name[GPS_PATH_MAX]; socket_t sock; @@ -356,7 +356,7 @@ int gpsd_open(struct gps_device_t *session) session->servicetype = service_nmea2000; return session->gpsdata.gps_fd; } -#endif /* NMEA2000_ENABLE */ +#endif /* defined(NMEA2000_ENABLE) && !defined(S_SPLINT_S) */ /* fall through to plain serial open */ return gpsd_serial_open(session); } |