diff options
| author | Simon Josefsson <simon@josefsson.org> | 2006-10-30 08:53:20 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2006-10-30 08:53:20 +0000 |
| commit | 27241018bdd26349578bb4b8c8f6baf0bbaaaa6a (patch) | |
| tree | 1b62a26b56012f5f7bfcd815491bb2b2b6862845 | |
| parent | 7df5419da539d9caf81727902fca00b73c0e2d9f (diff) | |
| download | gnutls-27241018bdd26349578bb4b8c8f6baf0bbaaaa6a.tar.gz | |
Simplify #include's using gnulib modules.
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | lib/defines.h | 25 |
2 files changed, 6 insertions, 22 deletions
diff --git a/configure.in b/configure.in index 0a2c672094..66a4144704 100644 --- a/configure.in +++ b/configure.in @@ -191,8 +191,7 @@ AC_MSG_RESULT([*** AC_HEADER_STDC AC_HEADER_TIME -AC_CHECK_HEADERS(unistd.h strings.h stddef.h alloca.h) -AC_CHECK_HEADERS(sys/stat.h sys/types.h sys/socket.h) +AC_CHECK_HEADERS(strings.h alloca.h) AC_CHECK_HEADERS(errno.h sys/time.h time.h) AC_CHECK_HEADERS(math.h limits.h float.h stdarg.h ctype.h) dnl opencdk diff --git a/lib/defines.h b/lib/defines.h index 0126e81c8a..68e766158c 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation + * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation * * Author: Nikos Mavroyanopoulos * @@ -42,21 +42,10 @@ typedef int ssize_t; #endif -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif - -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif - -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <sys/types.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/socket.h> #if TIME_WITH_SYS_TIME # include <sys/time.h> @@ -69,10 +58,6 @@ typedef int ssize_t; # endif #endif -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif - #include "memmem.h" #define SIZEOF_UNSIGNED_LONG_INT SIZEOF_UNSIGNED_LONG |