diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2013-10-30 11:17:06 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2013-10-30 11:17:06 -0400 |
| commit | ed99be6df93be541a66602d3f1b296f6c8f9797e (patch) | |
| tree | 57494bc23c77967807e6c7d2c8cee6d5765d325d /ppsthread.c | |
| parent | 9ade48462250c108fd7c2605faa0644348003c6a (diff) | |
| download | gpsd-ed99be6df93be541a66602d3f1b296f6c8f9797e.tar.gz | |
Re-enable compilation with ntpshm=no.
Diffstat (limited to 'ppsthread.c')
| -rw-r--r-- | ppsthread.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ppsthread.c b/ppsthread.c index f7d95350..64aa021f 100644 --- a/ppsthread.c +++ b/ppsthread.c @@ -33,9 +33,7 @@ #ifdef PPS_ENABLE #if defined(HAVE_SYS_TIMEPPS_H) #include <fcntl.h> /* needed for open() and friends */ -#endif -#if defined(HAVE_SYS_TIMEPPS_H) static pthread_mutex_t initialization_mutex; static volatile int uninitialized_pps_thread_count; #endif /* defined(HAVE_SYS_TIMEPPS_H) */ @@ -281,7 +279,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) break; } TVTOTS( &ts, &tv); -#endif +#endif /* HAVE_CLOCK_GETTIME */ /*@+noeffect@*/ /* ok and log used by KPPS and TIOMCWAIT */ @@ -501,7 +499,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg) ts = pi.clear_timestamp; /* structure copy */ } } else -#endif +#endif /* defined(HAVE_SYS_TIMEPPS_H) */ { // use plain PPS /*@i10@*/TVTOTS( &ts, &tv); |