rbb 99/12/01 10:39:45
Modified: src/lib/apr acconfig.h configure.in src/lib/apr/file_io/unix fileio.h readwrite.c src/lib/apr/include apr.h.in apr_errno.h apr_file_io.h apr_fnmatch.h apr_general.h apr_lib.h apr_md5.h apr_network_io.h apr_pools.h apr_portable.h apr_thread_proc.h src/lib/apr/lib apr_cpystrn.c apr_getpass.c apr_pools.c apr_signal.c apr_snprintf.c src/lib/apr/locks/unix locks.c src/lib/apr/network_io/unix networkio.h poll.c Log: The next step in removing the APR HAVE_*_H leak. This removes all of those checks from the public include files, and removes all unnecessary #include of system headers from public APR headers. The final step will add back in the checks once I can protect the namespace. Revision Changes Path 1.14 +0 -3 apache-2.0/src/lib/apr/acconfig.h Index: acconfig.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- acconfig.h 1999/11/17 18:09:55 1.13 +++ acconfig.h 1999/12/01 18:38:55 1.14 @@ -48,9 +48,6 @@ #undef APR_HAS_THREADS @BOTTOM@ -#define API_EXPORT(type) type -#define API_EXPORT_NONSTD(type) type -#define API_VAR_IMPORT extern /* Make sure we have ssize_t defined to be somethine */ #undef ssize_t 1.29 +38 -5 apache-2.0/src/lib/apr/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- configure.in 1999/11/30 18:45:50 1.28 +++ configure.in 1999/12/01 18:39:02 1.29 @@ -79,6 +79,26 @@ AC_SUBST(int_value) AC_SUBST(long_value) +if test "$ac_cv_type_off_t" = "yes"; then + off_t_value="off_t" +else + off_t_value="ap_int32_t" +fi +if test "$ac_cv_type_size_t" = "yes"; then + size_t_value="size_t" +else + size_t_value="ap_int32_t" +fi +if test "$ac_cv_type_ssize_t" = "yes"; then + ssize_t_value="ssize_t" +else + ssize_t_value="ap_int32_t" +fi + +AC_SUBST(off_t_value) +AC_SUBST(size_t_value) +AC_SUBST(ssize_t_value) + AC_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8) # Use /bin/sh if it exists, otherwise go looking for sh in the path @@ -216,6 +236,14 @@ AC_FUNC_MMAP AC_FUNC_SETPGRP +if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then + mmap="#define APR_HAS_MMAP 1" + AC_SUBST(mmap) +else + mmap="#define APR_HAS_MMAP 0" + AC_SUBST(mmap) +fi + AC_MSG_CHECKING(looking for union semun in sys/sem.h) AC_TRY_COMPILE([ #include <sys/types.h> @@ -243,13 +271,16 @@ [ --enable-threads Enable threading support in APR.], [ if test "$enableval" = "no"; then - AC_DEFINE(APR_HAS_THREADS, 0) + threads="#define APR_HAS_THREADS 0" + AC_SUBST(threads) AC_MSG_RESULT(no) else if test "$enableval" = "pthread"; then AC_CHECK_HEADERS(pthread.h, [ - AC_DEFINE(APR_HAS_THREADS, 1) ], [ - AC_DEFINE(APR_HAS_THREADS, 0) ] ) + threads="#define APR_HAS_THREADS 1" + AC_SUBST(threads) ], [ + threads="#define APR_HAS_THREADS 0" + AC_SUBST(threads) ] ) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -258,8 +289,10 @@ ], [ AC_CHECK_HEADERS(pthread.h, [ - AC_DEFINE(APR_HAS_THREADS, 1) ], [ - AC_DEFINE(APR_HAS_THREADS, 0) ] ) + threads="#define APR_HAS_THREADS 1" + AC_SUBST(threads) ], [ + threads="#define APR_HAS_THREADS 0" + AC_SUBST(threads) ] ) ]) 1.5 +1 -0 apache-2.0/src/lib/apr/file_io/unix/fileio.h Index: fileio.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fileio.h 1999/11/10 15:49:53 1.4 +++ fileio.h 1999/12/01 18:39:08 1.5 @@ -62,6 +62,7 @@ #include <time.h> #include <dirent.h> #include <sys/uio.h> +#include <stdio.h> #include "apr_general.h" #include "apr_file_io.h" #include "apr_errno.h" 1.17 +1 -0 apache-2.0/src/lib/apr/file_io/unix/readwrite.c Index: readwrite.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- readwrite.c 1999/11/10 15:49:53 1.16 +++ readwrite.c 1999/12/01 18:39:09 1.17 @@ -54,6 +54,7 @@ */ #include "fileio.h" +#include "apr_config.h" #include "apr_file_io.h" #include "apr_general.h" #include "apr_lib.h" 1.2 +24 -12 apache-2.0/src/lib/apr/include/apr.h.in Index: apr.h.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apr.h.in 1999/11/30 18:48:03 1.1 +++ apr.h.in 1999/12/01 18:39:11 1.2 @@ -1,23 +1,35 @@ + +#ifndef APR_H +#define APR_H + +#include <sys/types.h> + /* APR Feature Macros */ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ /* Typedefs that APR needs. */ -typedef @short_value@ ap_int16_t -typedef unsigned @short_value@ ap_uint16_t +typedef @short_value@ ap_int16_t; +typedef unsigned @short_value@ ap_uint16_t; -typedef @int_value@ ap_int32_t -typedef unsigned @int_value@ ap_uint32_t +typedef @int_value@ ap_int32_t; +typedef unsigned @int_value@ ap_uint32_t; -typedef @long_value@ ap_int64_t -typedef unsigned @long_value@ ap_uint64_t +typedef @long_value@ ap_int64_t; +typedef unsigned @long_value@ ap_uint64_t; +typedef @size_t_value@ ap_size_t; +typedef @ssize_t_value@ ap_ssize_t; +typedef @off_t_value@ ap_off_t; -/* Definitions that APR programs need to work properly. */ +typedef ap_int32_t ap_status_t; -#undef API_THREAD_FUNC -#undef API_EXPORT(type) -#undef API_VAR_IMPORT +/* Definitions that APR programs need to work properly. */ +#define API_THREAD_FUNC +#define API_EXPORT(type) type +#define API_EXPORT_NONSTD(type) type +#define API_VAR_IMPORT extern +#endif /* APR_H */ 1.10 +1 -0 apache-2.0/src/lib/apr/include/apr_errno.h Index: apr_errno.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- apr_errno.h 1999/11/22 18:00:55 1.9 +++ apr_errno.h 1999/12/01 18:39:12 1.10 @@ -54,6 +54,7 @@ */ #include <errno.h> +#include "apr.h" #ifndef APR_ERRNO_H #define APR_ERRNO_H 1.19 +0 -5 apache-2.0/src/lib/apr/include/apr_file_io.h Index: apr_file_io.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- apr_file_io.h 1999/11/10 15:49:55 1.18 +++ apr_file_io.h 1999/12/01 18:39:13 1.19 @@ -58,12 +58,7 @@ #include "apr_general.h" #include "apr_errno.h" -#ifdef HAVE_TIME_H -#include <time.h> -#endif -#ifdef HAVE_SYS_UIO_H #include <sys/uio.h> -#endif #ifdef __cplusplus extern "C" { 1.5 +3 -7 apache-2.0/src/lib/apr/include/apr_fnmatch.h Index: apr_fnmatch.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_fnmatch.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apr_fnmatch.h 1999/11/30 15:57:38 1.4 +++ apr_fnmatch.h 1999/12/01 18:39:14 1.5 @@ -34,15 +34,11 @@ */ /* This file has been modified by the Apache Group. */ -#ifndef WIN32 -#else -#include "apr_win.h" -#endif -#include "apr_errno.h" - #ifndef _APR_FNMATCH_H_ #define _APR_FNMATCH_H_ +#include "apr_errno.h" + #ifdef __cplusplus extern "C" { #endif @@ -59,7 +55,7 @@ int flags); /* this function is an Apache addition */ -API_EXPORT(extern int) ap_is_fnmatch(const char *pattern); +API_EXPORT(int) ap_is_fnmatch(const char *pattern); #ifdef __cplusplus } 1.11 +2 -48 apache-2.0/src/lib/apr/include/apr_general.h Index: apr_general.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- apr_general.h 1999/11/22 14:52:10 1.10 +++ apr_general.h 1999/12/01 18:39:15 1.11 @@ -53,28 +53,14 @@ * */ +#include "apr.h" + #ifdef WIN32 -#include "apr_win.h" #include <windows.h> -#else -#include "apr_config.h" #endif -#ifdef HAVE_STDIO_H #include <stdio.h> -#endif -#ifdef HAVE_MALLOC_H -#include <malloc.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef HAVE_SIGNAL_H -#include <signal.h> -#endif -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #include "apr_errno.h" #ifndef APR_GENERAL_H @@ -89,34 +75,6 @@ #define MAXIMUM_WAIT_OBJECTS 64 -#if (SIZEOF_SHORT == 2) -typedef short ap_int16_t; -typedef unsigned short ap_uint16_t; -#endif - -#if (SIZEOF_INT == 4) -typedef int ap_int32_t; -typedef unsigned int ap_uint32_t; -#endif - -#if (SIZEOF_LONG == 8) -typedef long ap_int64_t; -typedef unsigned long ap_uint64_t; -#elif (SIZEOF_LONG_LONG == 8) -typedef long long ap_int64_t; -typedef unsigned long long ap_uint64_t; -#elif (SIZEOF_LONG_DOUBLE == 8) -typedef long double ap_int64_t; -typedef unsigned long double ap_uint64_t; -#elif (SIZEOF_LONGLONG == 8) -typedef __int64 ap_int64_t; -typedef unsigned __int64 ap_uint64_t; -#endif - -typedef size_t ap_size_t; -typedef ssize_t ap_ssize_t; -typedef off_t ap_off_t; - #if SIZEOF_SSIZE_T == SIZEOF_INT # define APR_SSIZE_T_FMT "d" #elif SIZEOF_SSIZE_T == SIZEOF_LONG @@ -236,10 +194,6 @@ ap_status_t (*cleanup) (void *), ap_context_t *); ap_status_t ap_get_userdata(void **, char *, ap_context_t *); ap_status_t ap_initialize(void); - -ap_status_t ap_create_signal(ap_signum_t, ap_context_t *); -ap_status_t ap_send_signal(ap_signum_t, ap_context_t *); -ap_status_t ap_setup_signal(ap_signum_t, Sigfunc *, ap_context_t *); #ifdef __cplusplus } 1.19 +0 -31 apache-2.0/src/lib/apr/include/apr_lib.h Index: apr_lib.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- apr_lib.h 1999/11/30 15:57:42 1.18 +++ apr_lib.h 1999/12/01 18:39:16 1.19 @@ -66,40 +66,9 @@ #include "apr_general.h" #include "apr_file_io.h" -#if HAVE_DIRENT_H -#include <dirent.h> -#endif -#ifndef WIN32 -#else -#include "../file_io/win32/readdir.h" /* definition of DIR for WIN32 */ -#include "apr_win.h" -#endif -#ifdef HAVE_STDARG_H #include <stdarg.h> -#endif - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef HAVE_MALLOC_H -#include <malloc.h> -#endif -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif -#ifdef HAVE_SIGNAL_H -#include <signal.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -#ifdef HAVE_STRING_H -#include <string.h> -#endif #ifdef __cplusplus extern "C" { 1.5 +0 -7 apache-2.0/src/lib/apr/include/apr_md5.h Index: apr_md5.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_md5.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apr_md5.h 1999/11/23 13:46:55 1.4 +++ apr_md5.h 1999/12/01 18:39:18 1.5 @@ -88,14 +88,7 @@ #ifndef APACHE_MD5_H #define APACHE_MD5_H -#ifdef WIN32 -#include "apr_win.h" -#endif - #include "apr_lib.h" -#ifdef HAVE_CRYPT_H -#include <crypt.h> -#endif #ifdef __cplusplus extern "C" { 1.16 +0 -7 apache-2.0/src/lib/apr/include/apr_network_io.h Index: apr_network_io.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- apr_network_io.h 1999/10/29 13:36:28 1.15 +++ apr_network_io.h 1999/12/01 18:39:18 1.16 @@ -62,14 +62,7 @@ #include "apr_general.h" #include "apr_errno.h" -#include <time.h> - -#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> -#endif -#ifdef HAVE_SYS_UIO_H -#include <sys/uio.h> -#endif #ifdef __cplusplus extern "C" { 1.6 +0 -8 apache-2.0/src/lib/apr/include/apr_pools.h Index: apr_pools.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_pools.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apr_pools.h 1999/09/08 18:04:03 1.5 +++ apr_pools.h 1999/12/01 18:39:20 1.6 @@ -83,17 +83,9 @@ * alloc.c. */ - /* Need declaration of DIR on Win32 */ -#ifdef WIN32 -/*#include "../os/win32/readdir.h"*/ -#endif #include "apr_lib.h" #include <sys/types.h> -#ifdef HAVE_SYS_WAIT_H -#include <sys/wait.h> -#endif -#include <signal.h> struct process_chain { pid_t pid; 1.15 +4 -19 apache-2.0/src/lib/apr/include/apr_portable.h Index: apr_portable.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- apr_portable.h 1999/11/30 15:57:43 1.14 +++ apr_portable.h 1999/12/01 18:39:20 1.15 @@ -71,25 +71,10 @@ #include "apr_errno.h" #include "apr_lock.h" #include "apr_time.h" -#ifdef HAVE_DIR_H -#include <dir.h> -#endif -#ifdef HAVE_PTHREAD_H -#include <pthread.h> -#endif -#ifdef HAVE_TIME_H -#include <time.h> -#endif -#ifdef HAVE_FCNTL_H -#include <fcntl.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef HAVE_DIRENT_H -#include <dirent.h> -#endif +#include <dirent.h> +#include <fcntl.h> +#include <pthread.h> #ifdef WIN32 /* The primitives for Windows types */ @@ -177,7 +162,7 @@ typedef DIR ap_os_dir_t; typedef int ap_os_sock_t; typedef struct os_lock_t ap_os_lock_t; -#if APR_HAS_THREADS && HAVE_PTHREAD_H +#if APR_HAS_THREADS typedef pthread_t ap_os_thread_t; typedef pthread_key_t ap_os_threadkey_t; #endif 1.10 +0 -1 apache-2.0/src/lib/apr/include/apr_thread_proc.h Index: apr_thread_proc.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- apr_thread_proc.h 1999/10/15 14:19:58 1.9 +++ apr_thread_proc.h 1999/12/01 18:39:21 1.10 @@ -59,7 +59,6 @@ #include "apr_file_io.h" #include "apr_general.h" #include "apr_errno.h" -#include "apr_win.h" #ifdef __cplusplus extern "C" { 1.8 +3 -0 apache-2.0/src/lib/apr/lib/apr_cpystrn.c Index: apr_cpystrn.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_cpystrn.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- apr_cpystrn.c 1999/10/13 18:07:23 1.7 +++ apr_cpystrn.c 1999/12/01 18:39:34 1.8 @@ -64,6 +64,9 @@ #if HAVE_SYS_TYPES_H #include <sys/types.h> #endif +#if HAVE_STRING_H +#include <string.h> +#endif /* * Apache's "replacement" for the strncpy() function. We roll our 1.8 +4 -1 apache-2.0/src/lib/apr/lib/apr_getpass.c Index: apr_getpass.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_getpass.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- apr_getpass.c 1999/10/18 12:43:59 1.7 +++ apr_getpass.c 1999/12/01 18:39:34 1.8 @@ -70,6 +70,9 @@ #include <sys/types.h> #include <errno.h> +#if HAVE_UNISTD_H +#include <unistd.h> +#endif #if HAVE_CONIO_H #include <conio.h> #endif @@ -206,7 +209,7 @@ API_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t *bufsiz) { - char *pw_got; + char *pw_got = NULL; int result = 0; pw_got = getpass(prompt); 1.24 +6 -0 apache-2.0/src/lib/apr/lib/apr_pools.c Index: apr_pools.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- apr_pools.c 1999/11/27 01:08:14 1.23 +++ apr_pools.c 1999/12/01 18:39:35 1.24 @@ -76,6 +76,12 @@ #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif +#ifdef HAVE_SIGNAL_H +#include <sys/signal.h> +#endif +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif 1.3 +3 -0 apache-2.0/src/lib/apr/lib/apr_signal.c Index: apr_signal.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_signal.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apr_signal.c 1999/08/31 05:32:35 1.2 +++ apr_signal.c 1999/12/01 18:39:35 1.3 @@ -57,6 +57,9 @@ #include "apr_config.h" #include "apr_lib.h" +#ifdef HAVE_SIGNAL_H +#include <signal.h> +#endif #ifndef NO_USE_SIGACTION /* 1.3 +10 -1 apache-2.0/src/lib/apr/lib/apr_snprintf.c Index: apr_snprintf.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apr_snprintf.c 1999/09/12 10:52:17 1.2 +++ apr_snprintf.c 1999/12/01 18:39:36 1.3 @@ -68,7 +68,16 @@ #include "apr_lib.h" #include <math.h> #ifdef HAVE_CTYPE_H -# include <ctype.h> +#include <ctype.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_STRING_H +#include <string.h> #endif typedef enum { 1.13 +1 -0 apache-2.0/src/lib/apr/locks/unix/locks.c Index: locks.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- locks.c 1999/11/04 07:26:20 1.12 +++ locks.c 1999/12/01 18:39:41 1.13 @@ -53,6 +53,7 @@ * */ +#include "apr_config.h" #include "apr_general.h" #include "apr_portable.h" #include "apr_lib.h" 1.9 +1 -0 apache-2.0/src/lib/apr/network_io/unix/networkio.h Index: networkio.h =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- networkio.h 1999/10/24 05:59:15 1.8 +++ networkio.h 1999/12/01 18:39:42 1.9 @@ -56,6 +56,7 @@ #ifndef NETWORK_IO_H #define NETWORK_IO_H +#include "apr_config.h" #include "apr_network_io.h" #include "apr_general.h" #include "apr_lock.h" 1.15 +1 -0 apache-2.0/src/lib/apr/network_io/unix/poll.c Index: poll.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- poll.c 1999/10/15 14:20:13 1.14 +++ poll.c 1999/12/01 18:39:42 1.15 @@ -54,6 +54,7 @@ */ #include "networkio.h" +#include "apr_config.h" #include "apr_network_io.h" #include "apr_general.h" #include "apr_lib.h"