diff options
| author | roberto <roberto@FreeBSD.org> | 2009-12-15 14:58:10 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2009-12-15 14:58:10 +0000 |
| commit | 230e76b5380d386df4ba9fee065378a39a10e8b5 (patch) | |
| tree | 2928c8428ba1c1401c7dcd5d3c3c610fbb90b794 /contrib/ntp/ntpd/refclock_nmea.c | |
| parent | 2bc44b96096e82af8f7720c1883039f28c130aa0 (diff) | |
| parent | ecc42837d301a8d8e257020b30492277ad558d30 (diff) | |
| download | FreeBSD-src-230e76b5380d386df4ba9fee065378a39a10e8b5.zip FreeBSD-src-230e76b5380d386df4ba9fee065378a39a10e8b5.tar.gz | |
Merge 4.2.4p8 into contrib (r200452 & r200454).
Subversion is being difficult here so take a hammer and get it in.
MFC after: 2 weeks
Security: CVE-2009-3563
Diffstat (limited to 'contrib/ntp/ntpd/refclock_nmea.c')
| -rw-r--r-- | contrib/ntp/ntpd/refclock_nmea.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/ntp/ntpd/refclock_nmea.c b/contrib/ntp/ntpd/refclock_nmea.c index 5b124cb..a176ee8 100644 --- a/contrib/ntp/ntpd/refclock_nmea.c +++ b/contrib/ntp/ntpd/refclock_nmea.c @@ -7,11 +7,6 @@ #include <config.h> #endif -#if defined(SYS_WINNT) -#undef close -#define close closesocket -#endif - #if defined(REFCLOCK) && defined(CLOCK_NMEA) #include <stdio.h> @@ -27,6 +22,12 @@ # include "ppsapi_timepps.h" #endif /* HAVE_PPSAPI */ +#ifdef SYS_WINNT +extern int async_write(int, const void *, unsigned int); +#undef write +#define write(fd, data, octets) async_write(fd, data, octets) +#endif + /* * This driver supports the NMEA GPS Receiver with * |
