diff options
| -rw-r--r-- | gps.h | 16 | ||||
| -rw-r--r-- | libgps_sock.c | 4 |
2 files changed, 4 insertions, 16 deletions
@@ -2102,22 +2102,6 @@ extern double wgs84_separation(double, double); #define GPSD_SHARED_MEMORY "shared memory" #define GPSD_DBUS_EXPORT "DBUS export" -/* - * Platform-specific declarations - */ - -#ifdef _WIN32 -#define strtok_r(s,d,p) strtok_s(s,d,p) -#endif - -/* Some libcs don't have strlcat/strlcpy. Local copies are provided */ -#ifndef HAVE_STRLCAT -size_t strlcat(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); -#endif -#ifndef HAVE_STRLCPY -size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); -#endif - #ifdef __cplusplus } /* End of the 'extern "C"' block */ #endif diff --git a/libgps_sock.c b/libgps_sock.c index 2cb2d1e8..99b39b1a 100644 --- a/libgps_sock.c +++ b/libgps_sock.c @@ -40,6 +40,10 @@ extern char *strtok_r(char *, const char *, char **); #endif /* S_SPLINT_S */ +#ifdef _WIN32 +#define strtok_r(s,d,p) strtok_s(s,d,p) +#endif + /*@-matchfields@*/ struct privdata_t { |