diff options
Diffstat (limited to 'src/common.h')
| -rw-r--r-- | src/common.h | 155 |
1 files changed, 44 insertions, 111 deletions
diff --git a/src/common.h b/src/common.h index 89a054f..47a1ed1 100644 --- a/src/common.h +++ b/src/common.h @@ -32,134 +32,67 @@ /* * Include standard headers which are used through-out tinyproxy */ -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#ifdef HAVE_VALUES_H -# include <values.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> -#endif -#ifdef HAVE_STDDEF_H -# include <stddef.h> -#endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif -#ifdef HAVE_SYS_SELECT_H +/* standard C headers - we can safely assume they exist. */ +#include <stddef.h> +#include <stdint.h> +#include <ctype.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +/* standard POSIX headers - they need to be there as well. */ +# include <errno.h> +# include <fcntl.h> +# include <netdb.h> +# include <signal.h> +# include <stdarg.h> +# include <strings.h> +# include <syslog.h> +# include <wchar.h> +# include <wctype.h> +# include <sys/mman.h> # include <sys/select.h> -#endif -#ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> -#endif -#ifdef HAVE_SYS_STAT_H # include <sys/stat.h> -#endif - -#ifdef TIME_WITH_SYS_TIME -# include <sys/time.h> -# include <time.h> -#else -# ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -# else -# include <time.h> -# endif -#endif - -#ifdef HAVE_SYS_RESOURCE_H -# include <sys/resource.h> -#endif -#ifdef HAVE_SYS_UIO_H +# include <sys/types.h> +# include <sys/wait.h> # include <sys/uio.h> -#endif -#ifdef HAVE_SYS_UN_H # include <sys/un.h> -#endif -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif - -#ifdef HAVE_NETINET_IN_H +# include <sys/time.h> +# include <time.h> +# include <inttypes.h> +# include <sys/resource.h> # include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_INET_H +# include <assert.h> # include <arpa/inet.h> +# include <grp.h> +# include <pwd.h> +# include <regex.h> + +/* rest - some oddball headers */ +#ifdef HAVE_VALUES_H +# include <values.h> #endif + +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif + #ifdef HAVE_ALLOCA_H # include <alloca.h> #endif -#ifdef HAVE_ASSERT_H -# include <assert.h> -#endif -#ifdef HAVE_CTYPE_H -# include <ctype.h> -#endif -#ifdef HAVE_ERRNO_H -# include <errno.h> -#endif -#ifdef HAVE_FCNTL_H -# include <fcntl.h> -#endif -#ifdef HAVE_GRP_H -# include <grp.h> -#endif + #ifdef HAVE_MEMORY_H # include <memory.h> #endif -#ifdef HAVE_NETDB_H -# include <netdb.h> -#endif -#ifdef HAVE_PWD_H -# include <pwd.h> -#endif -#ifdef HAVE_REGEX_H -# include <regex.h> -#endif -#ifdef HAVE_SIGNAL_H -# include <signal.h> -#endif -#ifdef HAVE_STDARG_H -# include <stdarg.h> -#endif -#ifdef HAVE_STDIO_H -# include <stdio.h> -#endif -#ifdef HAVE_STDLIB_H -# include <stdlib.h> -#else -# ifdef HAVE_MALLOC_H -# include <malloc.h> -# endif -#endif -#ifdef HAVE_STRING_H -# include <string.h> -#endif -#ifdef HAVE_STRINGS_H -# include <strings.h> + +#ifdef HAVE_MALLOC_H +# include <malloc.h> #endif + #ifdef HAVE_SYSEXITS_H -# include <sysexits.h> -#endif -#ifdef HAVE_SYSLOG_H -# include <syslog.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#ifdef HAVE_WCHAR_H -# include <wchar.h> -#endif -#ifdef HAVE_WCTYPE_H -# include <wctype.h> -#endif -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> +# include <sysexits.h> #endif /* |