diff options
| author | Matt <ukyg9e5r6k7gubiekd6@yahoo.com> | 2014-09-28 03:37:05 +1000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-09-27 22:43:13 -0400 |
| commit | 65000a4058788fff214fc4e37cae34f268d182f7 (patch) | |
| tree | 729dbea9da4b59bdf3afc8c6c36712a2cf1fbbad /libgps.h | |
| parent | f25e639af0a40415aa28aa892b7c8e9f022aad46 (diff) | |
| download | gpsd-65000a4058788fff214fc4e37cae34f268d182f7.tar.gz | |
Add scons check for gmtime
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
The recent addition of a prototype for gmtime in gpsd.h breaks the
cygwin compile. Cygwin has gmtime, so the declarations conflict.
Handle this by adding an scons check for gmtime, and make declaration
of the bundled version conditional on absence of the system-supplied
version.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAEBAgAGBQJUJvXAAAoJECH/phKUbjXCdgwH/RrMznXe51HHR5eLD3Y/vor8
h514XtvlzB/ghWQcAuiWX8mGy/J7k8OJFb8HmUXPAhSuzeiRooZXLz7uk3UvfeGv
4p5MfND3E7FCZVBu9/o9n5gf27wddXKChHVfAZ1MsnusRmwfjAiPoTr0iVoarWLw
s/8tjvnHJg4A3i08nu4Y+Z9rwyDqkmB2YPQ0Zs+deCsbK4AA4Lx3oVkgDkVCk7zz
vBZPueS6ylAMb1hbEthW3l7St3S2ESLG7nIxwv1lQ0mmAi70pknHeLYbiBLU0QqT
A2ZsOOajespqq9/pmxP6ZJcwy8DtNXcj8LvRcNAOrjiV52MQUwTZGLLwVP5WMxk=
=PoQy
-----END PGP SIGNATURE-----
Diffstat (limited to 'libgps.h')
| -rw-r--r-- | libgps.h | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -6,6 +6,8 @@ #ifndef _GPSD_LIBGPS_H_ #define _GPSD_LIBGPS_H_ +#include "gpsd_config.h" + /* values to poke in the gps_fd member if we get it via something special */ #define SHM_PSEUDO_FD -1 #define DBUS_PSEUDO_FD -2 @@ -36,9 +38,9 @@ extern int json_ais_read(const char *, char *, size_t, struct ais_t *, #define PRIVATE(gpsdata) ((struct privdata_t *)(gpsdata)->privdata) -#ifndef __GLIBC__ -/* in case target doesn't use glibc */ +#ifndef HAVE_GMTIME +/* in case target doesn't have gmtime */ extern time_t gmtime(register struct tm *); -#endif +#endif /* ndef HAVE_GMTIME */ #endif /* _GPSD_LIBGPS_H_ */ |