diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | gpsd.h-tail | 5 | ||||
| -rw-r--r-- | gpxlogger.c | 4 | ||||
| -rw-r--r-- | net_dgpsip.c | 8 | ||||
| -rw-r--r-- | sockaddr.h | 18 |
5 files changed, 6 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac index b1204adc..206cc31e 100644 --- a/configure.ac +++ b/configure.ac @@ -178,14 +178,7 @@ if eval "test x$GCC = xyes"; then dnl -Wcast-qual -W fi -AC_CHECK_HEADERS(sys/termios.h sys/select.h sys/time.h sys/modem.h sys/ipc.h sys/shm.h sys/stat.h sys/socket.h sys/ioctl.h sys/un.h) -AC_CHECK_HEADERS(arpa/inet.h netinet/in_systm.h netinet/in.h netinet/tcp.h) -AC_CHECK_HEADERS([netinet/ip.h], [], [], -[[#if HAVE_NETINET_IN_SYSTM_H && HAVE_NETINET_IN_H -#include netinet/ip.h -#endif -]]) -AC_CHECK_HEADERS(termios.h strings.h getopt.h netdb.h syslog.h pwd.h grp.h) +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_FUNCS(round, roundf) diff --git a/gpsd.h-tail b/gpsd.h-tail index 42ab204d..90faa6b8 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -5,12 +5,7 @@ */ #endif /* GPSD_CONFIG_H */ -#ifdef HAVE_TERMIOS_H #include <termios.h> -#endif -#ifdef HAVE_SYS_TERMIOS_H -#include <sys/termios.h> -#endif #include "gps.h" #ifdef _WIN32 diff --git a/gpxlogger.c b/gpxlogger.c index 8207a489..43d468d7 100644 --- a/gpxlogger.c +++ b/gpxlogger.c @@ -3,16 +3,14 @@ * BSD terms apply: see the file COPYING in the distribution root for details. */ #include <stdlib.h> -#include "gpsd_config.h" #include <string.h> -#ifdef HAVE_SYSLOG_H #include <syslog.h> -#endif /* HAVE_SYSLOG_H */ #include <math.h> #include <errno.h> #ifndef S_SPLINT_S #include <unistd.h> #endif /* S_SPLINT_S */ + #include "gps.h" #include "gpsdclient.h" #include "revision.h" diff --git a/net_dgpsip.c b/net_dgpsip.c index 81ea0bda..18fb88af 100644 --- a/net_dgpsip.c +++ b/net_dgpsip.c @@ -6,17 +6,11 @@ #include <stdlib.h> #include <string.h> #include <fcntl.h> +#include <netdb.h> #ifndef S_SPLINT_S #include <unistd.h> #endif /* S_SPLINT_S */ -#include "gpsd_config.h" -#ifndef S_SPLINT_S -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif /* HAVE_NETDB_H */ -#endif /* S_SPLINT_S */ - #include "gpsd.h" /*@ -branchstate */ @@ -1,23 +1,11 @@ /* klugey def'n of a socket address struct helps hide IPV4 vs. IPV6 ugliness */ -#ifndef S_SPLINT_S -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#else -#define AF_UNSPEC 0 -#endif /* HAVE_SYS_SOCKET_H */ -#ifdef HAVE_SYS_UN_H +#include <netdb.h> #include <sys/un.h> -#endif /* HAVE_SYS_UN_H */ -#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> -#endif /* HAVE_NETINET_IN_H */ -#ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> -#endif /* HAVE_ARPA_INET_H */ -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif /* HAVE_NETDB_H */ +#ifndef S_SPLINT_S +#include <sys/socket.h> #endif /* S_SPLINT_S */ typedef union sockaddr_u { |