diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2010-12-14 10:45:34 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2010-12-14 10:45:34 -0500 |
| commit | 6cfb37de24cd6917c01c8794808917513ccaac45 (patch) | |
| tree | 59a351ab32dcd05d36d2b02dedbc3831e564b01a | |
| parent | 6cee03b5e3ee6eb79210a9ed1e3ba5fa0037e4ca (diff) | |
| download | gpsd-6cfb37de24cd6917c01c8794808917513ccaac45.tar.gz | |
More configure simplification.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | ntpshm.c | 15 |
2 files changed, 4 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 206cc31e..ed5e97f6 100644 --- a/configure.ac +++ b/configure.ac @@ -178,13 +178,11 @@ if eval "test x$GCC = xyes"; then dnl -Wcast-qual -W fi -AC_CHECK_HEADERS(sys/modem.h sys/ipc.h sys/shm.h sys/ioctl.h) -AC_CHECK_HEADERS(endian.h sys/endian.h) +AC_CHECK_HEADERS(sys/modem.h sys/ioctl.h endian.h sys/endian.h) AC_CHECK_FUNCS(round, roundf) AC_CHECK_FUNCS(strlcpy) AC_CHECK_FUNCS(strlcat) -AC_CHECK_FUNCS(strtonum) AC_CHECK_FUNCS(setlocale) AC_CHECK_FUNCS(vsnprintf) @@ -8,27 +8,18 @@ */ #include <stdlib.h> -#include "gpsd_config.h" -#ifndef S_SPLINT_S -#include <unistd.h> -#endif /* S_SPLINT_S */ #include <string.h> #include <math.h> #include <errno.h> +#ifndef S_SPLINT_S +#include <unistd.h> +#endif /* S_SPLINT_S */ #include "gpsd.h" #ifdef NTPSHM_ENABLE - -#if defined(HAVE_SYS_TIME_H) #include <sys/time.h> -#endif - -#ifdef HAVE_SYS_IPC_H #include <sys/ipc.h> -#endif /* HAVE_SYS_IPC_H */ -#ifdef HAVE_SYS_SHM_H #include <sys/shm.h> -#endif /* HAVE_SYS_SHM_H */ #define PPS_MAX_OFFSET 100000 /* microseconds the PPS can 'pull' */ #define PUT_MAX_OFFSET 1000000 /* microseconds for lost lock */ |