wrowe 01/02/25 12:39:41
Modified: file_io/unix dir.c flock.c readwrite.c
file_io/win32 dir.c
i18n/unix xlate.c
include apr.h.in apr.hw
include/arch/os2 networkio.h
include/arch/unix fileio.h locks.h misc.h networkio.h
threadproc.h
include/arch/win32 apr_private.h fileio.h
lib apr_pools.c
misc/unix errorcodes.c getuuid.c rand.c
mmap/unix mmap.c
network_io/unix inet_ntop.c inet_pton.c sa_common.c
passwd apr_getpass.c apr_md5.c
strings apr_cpystrn.c apr_fnmatch.c apr_snprintf.c
tables apr_hash.c apr_tables.c
test testoc.c
threadproc/unix procsup.c signals.c
threadproc/win32 signals.c
time/unix time.c timestr.c
user/win32 groupinfo.c
Log:
Fix the hosed #ifdef APR_HAVE_FOO_H tests, the #if HAVE_ tests, and
also cleanup s/#ifdef HAVE_FOO_H/#if APR_HAVE_FOO_H/ whrere appropriate.
Revision Changes Path
1.55 +2 -2 apr/file_io/unix/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/dir.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- dir.c 2001/02/21 14:52:15 1.54
+++ dir.c 2001/02/25 20:39:29 1.55
@@ -55,10 +55,10 @@
#include "fileio.h"
#include "apr_strings.h"
#include "apr_portable.h"
-#ifdef HAVE_SYS_SYSLIMITS_H
+#if APR_HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
-#ifdef HAVE_LIMITS_H
+#if APR_HAVE_LIMITS_H
#include <limits.h>
#endif
1.4 +1 -1 apr/file_io/unix/flock.c
Index: flock.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/flock.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- flock.c 2001/02/16 04:15:37 1.3
+++ flock.c 2001/02/25 20:39:29 1.4
@@ -54,7 +54,7 @@
#include "fileio.h"
-#ifdef HAVE_FCNTL_H
+#if APR_HAVE_FCNTL_H
#include <fcntl.h>
#endif
#ifdef HAVE_SYS_FILE_H
1.68 +1 -1 apr/file_io/unix/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/readwrite.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- readwrite.c 2001/02/16 04:15:37 1.67
+++ readwrite.c 2001/02/25 20:39:29 1.68
@@ -281,7 +281,7 @@
apr_size_t nvec, apr_size_t *nbytes)
{
#ifdef HAVE_WRITEV
- int bytes;
+ int bytes;
if ((bytes = writev(thefile->filedes, vec, nvec)) < 0) {
*nbytes = 0;
1.55 +1 -1 apr/file_io/win32/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/dir.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- dir.c 2001/02/21 14:49:45 1.54
+++ dir.c 2001/02/25 20:39:30 1.55
@@ -62,7 +62,7 @@
#if APR_HAVE_ERRNO_H
#include <errno.h>
#endif
-#ifdef HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
#if APR_HAVE_DIRENT_H
1.22 +5 -5 apr/i18n/unix/xlate.c
Index: xlate.c
===================================================================
RCS file: /home/cvs/apr/i18n/unix/xlate.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xlate.c 2001/02/16 04:15:41 1.21
+++ xlate.c 2001/02/25 20:39:30 1.22
@@ -95,7 +95,7 @@
char *frompage;
char *topage;
char *sbcs_table;
-#ifdef HAVE_ICONV
+#ifdev HAVE_ICONV
iconv_t ich;
#endif
};
@@ -173,7 +173,7 @@
static apr_status_t apr_xlate_cleanup(void *convset)
{
-#ifdef HAVE_ICONV
+#ifdev HAVE_ICONV
apr_xlate_t *old = convset;
if (old->ich != (iconv_t)-1) {
@@ -185,7 +185,7 @@
return APR_SUCCESS;
}
-#ifdef HAVE_ICONV
+#ifdev HAVE_ICONV
static void check_sbcs(apr_xlate_t *convset)
{
char inbuf[256], outbuf[256];
@@ -251,7 +251,7 @@
set found to non-zero if found in the cache
#endif
-#ifdef HAVE_ICONV
+#ifdev HAVE_ICONV
if (!found) {
new->ich = iconv_open(topage, frompage);
if (new->ich == (iconv_t)-1) {
@@ -287,7 +287,7 @@
apr_size_t *outbytes_left)
{
apr_status_t status = APR_SUCCESS;
-#ifdef HAVE_ICONV
+#ifdev HAVE_ICONV
size_t translated;
if (convset->ich != (iconv_t)-1) {
1.70 +2 -1 apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apr/include/apr.h.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- apr.h.in 2001/02/25 06:39:34 1.69
+++ apr.h.in 2001/02/25 20:39:30 1.70
@@ -24,6 +24,7 @@
#endif
#define APR_HAVE_ARPA_INET_H @arpa_ineth@
+#define APR_HAVE_CONIO_H @conioh@
#define APR_HAVE_CRYPT_H @crypth@
#define APR_HAVE_CTYPE_H @ctypeh@
#define APR_HAVE_DIRENT_H @direnth@
@@ -37,6 +38,7 @@
#define APR_HAVE_STDARG_H @stdargh@
#define APR_HAVE_STDIO_H @stdioh@
#define APR_HAVE_STDLIB_H @stdlibh@
+#define APR_HAVE_SIGNAL_H @signalh@
#define APR_HAVE_STRING_H @stringh@
#define APR_HAVE_STRINGS_H @stringsh@
#define APR_HAVE_SYS_SIGNAL_H @sys_signalh@
@@ -44,7 +46,6 @@
#define APR_HAVE_SYS_SYSLIMITS_H @sys_syslimitsh@
#define APR_HAVE_SYS_TYPES_H @sys_typesh@
#define APR_HAVE_SYS_UIO_H @sys_uioh@
-#define APR_HAVE_SIGNAL_H @signalh@
#define APR_HAVE_SYS_WAIT_H @sys_waith@
#define APR_HAVE_UNISTD_H @unistdh@
1.56 +3 -2 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- apr.hw 2001/02/24 11:23:19 1.55
+++ apr.hw 2001/02/25 20:39:31 1.56
@@ -115,16 +115,18 @@
#define NO_USE_SIGACTION
#define APR_HAVE_ARPA_INET_H 0
+#define APR_HAVE_CONIO_H 1
#define APR_HAVE_CRYPT_H 0
#define APR_HAVE_CTYPE_H 1
#define APR_HAVE_DIRENT_H 0
#define APR_HAVE_ERRNO_H 1
#define APR_HAVE_FCNTL_H 1
#define APR_HAVE_IO_H 1
-#define APR_HAVE_LIMITS_H 0
+#define APR_HAVE_LIMITS_H 1
#define APR_HAVE_NETDB_H 0
#define APR_HAVE_NETINET_IN_H 0
#define APR_HAVE_PTHREAD_H 0
+#define APR_HAVE_SIGNAL_H 1
#define APR_HAVE_STDARG_H 1
#define APR_HAVE_STDIO_H 1
#define APR_HAVE_STDLIB_H 1
@@ -135,7 +137,6 @@
#define APR_HAVE_SYS_SYSLIMITS_H 0
#define APR_HAVE_SYS_TYPES_H 1
#define APR_HAVE_SYS_UIO_H 0
-#define APR_HAVE_SIGNAL_H 1
#define APR_HAVE_SYS_WAIT_H 0
#define APR_HAVE_UNISTD_H 0
1.19 +1 -1 apr/include/arch/os2/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/os2/networkio.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- networkio.h 2001/02/16 04:15:50 1.18
+++ networkio.h 2001/02/25 20:39:31 1.19
@@ -59,7 +59,7 @@
#include "apr_network_io.h"
#include "apr_general.h"
#include "os2calls.h"
-#if HAVE_NETDB_H
+#if APR_HAVE_NETDB_H
#include <netdb.h>
#endif
1.33 +5 -5 apr/include/arch/unix/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/fileio.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fileio.h 2001/02/23 20:29:07 1.32
+++ fileio.h 2001/02/25 20:39:31 1.33
@@ -74,7 +74,7 @@
#if APR_HAVE_ERRNO_H
#include <errno.h>
#endif
-#if HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
#if APR_HAVE_STRINGS_H
@@ -83,22 +83,22 @@
#if APR_HAVE_DIRENT_H
#include <dirent.h>
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
-#if HAVE_UNISTD_H
+#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
#if APR_HAVE_STDIO_H
#include <stdio.h>
#endif
-#if HAVE_STDLIB_H
+#if APR_HAVE_STDLIB_H
#include <stdlib.h>
#endif
#if APR_HAVE_SYS_UIO_H
#include <sys/uio.h>
#endif
-#if HAVE_SYS_TIME_H
+#if APR_HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef BEOS
1.26 +3 -4 apr/include/arch/unix/locks.h
Index: locks.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/locks.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- locks.h 2001/02/16 04:15:51 1.25
+++ locks.h 2001/02/25 20:39:32 1.26
@@ -72,20 +72,19 @@
#include <fcntl.h>
#endif
-/* ### create APR_HAVE_* macros for these? */
#ifdef HAVE_SYS_SEM_H
#include <sys/sem.h>
#endif
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
#endif
-#ifdef HAVE_STDLIB_H
+#if APR_HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_UNISTD_H
+#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
#ifdef HAVE_SYS_MMAN_H
1.25 +2 -2 apr/include/arch/unix/misc.h
Index: misc.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/misc.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- misc.h 2001/02/16 04:15:51 1.24
+++ misc.h 2001/02/25 20:39:32 1.25
@@ -76,10 +76,10 @@
#endif
/* ### create APR_HAVE_* macros for these? */
-#ifdef HAVE_STDLIB_H
+#if APR_HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
1.38 +11 -11 apr/include/arch/unix/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/networkio.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- networkio.h 2001/02/16 04:15:51 1.37
+++ networkio.h 2001/02/25 20:39:32 1.38
@@ -69,43 +69,43 @@
#if APR_HAVE_SYS_UIO_H
#include <sys/uio.h>
#endif
-#if HAVE_SYS_POLL_H
+#if APR_HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif
-#if HAVE_POLL_H
+#ifdef HAVE_POLL_H
#include <poll.h>
#endif
#if APR_HAVE_ERRNO_H
#include <errno.h>
#endif
-#if HAVE_SYS_TIME_H
+#if APR_HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
-#if HAVE_UNISTD_H
+#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
-#if HAVE_NETINET_TCP_H
+#if APR_HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
-#if HAVE_NETINET_IN_H
+#if APR_HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
-#if HAVE_ARPA_INET_H
+#if APR_HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
-#if HAVE_SYS_SOCKET_H
+#if APR_HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-#if HAVE_NETDB_H
+#if APR_HAVE_NETDB_H
#include <netdb.h>
#endif
#if APR_HAVE_FCNTL_H
#include <fcntl.h>
#endif
-#if HAVE_SYS_SENDFILE_H
+#if APR_HAVE_SYS_SENDFILE_H
#include <sys/sendfile.h>
#endif
/* End System Headers */
1.17 +3 -3 apr/include/arch/unix/threadproc.h
Index: threadproc.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/threadproc.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- threadproc.h 2001/02/16 04:15:51 1.16
+++ threadproc.h 2001/02/25 20:39:32 1.17
@@ -62,19 +62,19 @@
#if APR_HAVE_PTHREAD_H
#include <pthread.h>
#endif
-#if HAVE_SYS_RESOURCE_H
+#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif
#if APR_HAVE_SIGNAL_H
#include <signal.h>
#endif
-#if HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
#if APR_HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
-#if HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
/* End System Headers */
1.21 +3 -3 apr/include/arch/win32/apr_private.h
Index: apr_private.h
===================================================================
RCS file: /home/cvs/apr/include/arch/win32/apr_private.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- apr_private.h 2001/02/16 04:15:52 1.20
+++ apr_private.h 2001/02/25 20:39:33 1.21
@@ -111,11 +111,11 @@
/* Use this section to define all of the HAVE_FOO_H
* that are required to build properly.
*/
-#define HAVE_CONIO_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_STDLIB_H 1
#define HAVE_LIMITS_H 1
+#define HAVE_MALLOC_H 1
#define HAVE_SIGNAL_H 1
+/* #define HAVE_STDDEF_H 1 why not? */
+#define HAVE_STDLIB_H 1
#define HAVE_STRICMP 1
#define HAVE_STRNICMP 1
1.49 +2 -5 apr/include/arch/win32/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/win32/fileio.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- fileio.h 2001/02/16 04:15:52 1.48
+++ fileio.h 2001/02/25 20:39:33 1.49
@@ -66,10 +66,10 @@
#include "apr_errno.h"
#include "misc.h"
-#if APR_HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
-#ifdef HAVE_SYS_TYPES_H
+#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_FCNTL_H
@@ -83,9 +83,6 @@
#endif
#ifdef HAVE_MALLOC_H
#include <malloc.h>
-#endif
-#ifdef HAVE_UIO_H
-#include <sys/uio.h>
#endif
#if APR_HAS_UNICODE_FS
1.89 +5 -5 apr/lib/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apr/lib/apr_pools.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- apr_pools.c 2001/02/19 02:06:59 1.88
+++ apr_pools.c 2001/02/25 20:39:33 1.89
@@ -70,13 +70,13 @@
#include "apr_lock.h"
#include "apr_hash.h"
-#ifdef HAVE_STDIO_H
+#if APR_HAVE_STDIO_H
#include <stdio.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
-#ifdef HAVE_SYS_SIGNAL_H
+#if APR_HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
#endif
#if APR_HAVE_SIGNAL_H
@@ -88,17 +88,17 @@
#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#ifdef HAVE_UNISTD_H
+#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
#if APR_HAVE_FCNTL_H
#include <fcntl.h>
#endif
-#ifdef HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
-#ifdef HAVE_STDLIB_H
+#if APR_HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef HAVE_MALLOC_H
1.33 +1 -1 apr/misc/unix/errorcodes.c
Index: errorcodes.c
===================================================================
RCS file: /home/cvs/apr/misc/unix/errorcodes.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- errorcodes.c 2001/02/16 04:15:56 1.32
+++ errorcodes.c 2001/02/25 20:39:34 1.33
@@ -57,7 +57,7 @@
#include "apr_lib.h"
#include "apr_dso.h"
-#ifdef HAVE_NETDB_H
+#if APR_HAVE_NETDB_H
#include <netdb.h>
#endif
#ifdef HAVE_DLFCN_H
1.10 +1 -1 apr/misc/unix/getuuid.c
Index: getuuid.c
===================================================================
RCS file: /home/cvs/apr/misc/unix/getuuid.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- getuuid.c 2001/02/16 04:15:56 1.9
+++ getuuid.c 2001/02/25 20:39:34 1.10
@@ -72,7 +72,7 @@
#if APR_HAVE_STRINGS_H
#include <strings.h>
#endif
-#ifdef HAVE_NETDB_H
+#if APR_HAVE_NETDB_H
#include <netdb.h>
#endif
1.6 +1 -1 apr/misc/unix/rand.c
Index: rand.c
===================================================================
RCS file: /home/cvs/apr/misc/unix/rand.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rand.c 2001/02/24 04:29:21 1.5
+++ rand.c 2001/02/25 20:39:34 1.6
@@ -56,7 +56,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#ifdef HAVE_UNISTD_H
+#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
1.34 +3 -3 apr/mmap/unix/mmap.c
Index: mmap.c
===================================================================
RCS file: /home/cvs/apr/mmap/unix/mmap.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mmap.c 2001/02/16 04:15:59 1.33
+++ mmap.c 2001/02/25 20:39:35 1.34
@@ -64,16 +64,16 @@
#ifdef BEOS
#include <kernel/OS.h>
#endif
-#if HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
#if APR_HAVE_STDIO_H
#include <stdio.h>
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
-#if HAVE_SYS_MMAN_H
+#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif
1.5 +4 -4 apr/network_io/unix/inet_ntop.c
Index: inet_ntop.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/inet_ntop.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- inet_ntop.c 2000/11/18 13:28:12 1.4
+++ inet_ntop.c 2001/02/25 20:39:35 1.5
@@ -17,16 +17,16 @@
#include "apr_private.h"
#include "networkio.h"
-#ifdef HAVE_SYS_TYPES_H
+#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#ifdef HAVE_SYS_SOCKET_H
+#if APR_HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-#ifdef HAVE_NETINET_IN_H
+#if APR_HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
-#ifdef HAVE_ARPA_INET_H
+#if APR_HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#include <string.h>
1.3 +4 -4 apr/network_io/unix/inet_pton.c
Index: inet_pton.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/inet_pton.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- inet_pton.c 2000/11/16 15:28:55 1.2
+++ inet_pton.c 2001/02/25 20:39:35 1.3
@@ -17,16 +17,16 @@
#include "apr_private.h"
#include "networkio.h"
-#ifdef HAVE_SYS_TYPES_H
+#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#ifdef HAVE_SYS_SOCKET_H
+#if APR_HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-#ifdef HAVE_NETINET_IN_H
+#if APR_HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
-#ifdef HAVE_ARPA_INET_H
+#if APR_HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#include <string.h>
1.29 +1 -1 apr/network_io/unix/sa_common.c
Index: sa_common.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/sa_common.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sa_common.c 2001/02/16 04:16:02 1.28
+++ sa_common.c 2001/02/25 20:39:35 1.29
@@ -67,7 +67,7 @@
#include "apr_lib.h"
#include "apr_strings.h"
-#ifdef HAVE_STDLIB_H
+#if APR_HAVE_STDLIB_H
#include <stdlib.h>
#endif
1.16 +3 -3 apr/passwd/apr_getpass.c
Index: apr_getpass.c
===================================================================
RCS file: /home/cvs/apr/passwd/apr_getpass.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apr_getpass.c 2001/02/16 04:16:05 1.15
+++ apr_getpass.c 2001/02/25 20:39:36 1.16
@@ -64,13 +64,13 @@
#include <sys/types.h>
#include <errno.h>
-#if HAVE_UNISTD_H
+#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if HAVE_CONIO_H
+#if APR_HAVE_CONIO_H
#include <conio.h>
#endif
-#if HAVE_STDLIB_H
+#if APR_HAVE_STDLIB_H
#include <stdlib.h>
#endif
#if APR_HAVE_STRING_H
1.9 +3 -3 apr/passwd/apr_md5.c
Index: apr_md5.c
===================================================================
RCS file: /home/cvs/apr/passwd/apr_md5.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apr_md5.c 2001/02/16 04:16:06 1.8
+++ apr_md5.c 2001/02/25 20:39:36 1.9
@@ -102,13 +102,13 @@
#include "apr_md5.h"
#include "apr_lib.h"
-#ifdef HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
-#ifdef HAVE_CRYPT_H
+#if APR_HAVE_CRYPT_H
#include <crypt.h>
#endif
-#ifdef HAVE_UNISTD_H
+#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
1.7 +2 -2 apr/strings/apr_cpystrn.c
Index: apr_cpystrn.c
===================================================================
RCS file: /home/cvs/apr/strings/apr_cpystrn.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_cpystrn.c 2001/02/16 04:16:07 1.6
+++ apr_cpystrn.c 2001/02/25 20:39:37 1.7
@@ -60,10 +60,10 @@
#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#if HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
-#if HAVE_CTYPE_H
+#if APR_HAVE_CTYPE_H
#include <ctype.h>
#endif
1.5 +1 -1 apr/strings/apr_fnmatch.c
Index: apr_fnmatch.c
===================================================================
RCS file: /home/cvs/apr/strings/apr_fnmatch.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apr_fnmatch.c 2000/10/16 06:04:48 1.4
+++ apr_fnmatch.c 2001/02/25 20:39:37 1.5
@@ -48,7 +48,7 @@
#include "apr_fnmatch.h"
#include "apr_lib.h"
#include <string.h>
-#ifdef HAVE_CTYPE_H
+#if APR_HAVE_CTYPE_H
# include <ctype.h>
#endif
1.12 +5 -5 apr/strings/apr_snprintf.c
Index: apr_snprintf.c
===================================================================
RCS file: /home/cvs/apr/strings/apr_snprintf.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apr_snprintf.c 2001/02/16 04:16:07 1.11
+++ apr_snprintf.c 2001/02/25 20:39:37 1.12
@@ -63,22 +63,22 @@
#include "apr_strings.h"
#include "apr_network_io.h"
#include <math.h>
-#ifdef HAVE_CTYPE_H
+#if APR_HAVE_CTYPE_H
#include <ctype.h>
#endif
#if APR_HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
-#ifdef HAVE_SYS_SOCKET_H
+#if APR_HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-#ifdef HAVE_ARPA_INET_H
+#if APR_HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
-#ifdef HAVE_LIMITS_H
+#if APR_HAVE_LIMITS_H
#include <limits.h>
#endif
-#ifdef HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
1.14 +2 -2 apr/tables/apr_hash.c
Index: apr_hash.c
===================================================================
RCS file: /home/cvs/apr/tables/apr_hash.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- apr_hash.c 2001/02/16 04:16:08 1.13
+++ apr_hash.c 2001/02/25 20:39:38 1.14
@@ -63,10 +63,10 @@
#include "apr_hash.h"
-#ifdef HAVE_STDLIB_H
+#if APR_HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#ifdef HAVE_STDLIB_H
+#if APR_HAVE_STDLIB_H
#include <string.h>
#endif
1.13 +2 -2 apr/tables/apr_tables.c
Index: apr_tables.c
===================================================================
RCS file: /home/cvs/apr/tables/apr_tables.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apr_tables.c 2001/02/16 04:16:08 1.12
+++ apr_tables.c 2001/02/25 20:39:38 1.13
@@ -66,13 +66,13 @@
#include "apr_tables.h"
#include "apr_strings.h"
#include "apr_lib.h"
-#ifdef HAVE_STDLIB_H
+#if APR_HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
-#ifdef HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
#if APR_HAVE_STRINGS_H
1.19 +1 -1 apr/test/testoc.c
Index: testoc.c
===================================================================
RCS file: /home/cvs/apr/test/testoc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- testoc.c 2001/02/16 04:16:10 1.18
+++ testoc.c 2001/02/25 20:39:39 1.19
@@ -60,7 +60,7 @@
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
+#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
1.30 +1 -1 apr/threadproc/unix/procsup.c
Index: procsup.c
===================================================================
RCS file: /home/cvs/apr/threadproc/unix/procsup.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- procsup.c 2001/02/16 04:16:18 1.29
+++ procsup.c 2001/02/25 20:39:39 1.30
@@ -72,7 +72,7 @@
}
/* RAISE_SIGSTOP(DETACH);*/
#endif
-#if HAVE_SETSID
+#if APR_HAVE_SETSID
if ((pgrp = setsid()) == -1) {
return errno;
}
1.25 +1 -1 apr/threadproc/unix/signals.c
Index: signals.c
===================================================================
RCS file: /home/cvs/apr/threadproc/unix/signals.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- signals.c 2001/02/25 06:39:34 1.24
+++ signals.c 2001/02/25 20:39:39 1.25
@@ -88,7 +88,7 @@
}
-#ifdef HAVE_SIGACTION
+#if APR_HAVE_SIGACTION
/*
* Replace standard signal() with the more reliable sigaction equivalent
1.15 +1 -1 apr/threadproc/win32/signals.c
Index: signals.c
===================================================================
RCS file: /home/cvs/apr/threadproc/win32/signals.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- signals.c 2001/02/16 04:16:20 1.14
+++ signals.c 2001/02/25 20:39:40 1.15
@@ -59,7 +59,7 @@
#include "apr_general.h"
#include <signal.h>
#include <string.h>
-#ifdef HAVE_SYS_WAIT
+#if APR_HAVE_SYS_WAIT
#include <sys/wait.h>
#endif
1.37 +3 -3 apr/time/unix/time.c
Index: time.c
===================================================================
RCS file: /home/cvs/apr/time/unix/time.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- time.c 2001/02/16 04:16:22 1.36
+++ time.c 2001/02/25 20:39:40 1.37
@@ -57,13 +57,13 @@
#include "apr_lib.h"
#include "apr_private.h"
/* System Headers required for time library */
-#if HAVE_SYS_TIME_H
+#if APR_HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
-#if HAVE_UNISTD_H
+#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if HAVE_TIME_H
+#ifdef HAVE_TIME_H
#include <time.h>
#endif
#ifdef BEOS
1.21 +3 -3 apr/time/unix/timestr.c
Index: timestr.c
===================================================================
RCS file: /home/cvs/apr/time/unix/timestr.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- timestr.c 2001/02/16 04:16:22 1.20
+++ timestr.c 2001/02/25 20:39:41 1.21
@@ -57,13 +57,13 @@
#include "apr_lib.h"
#include "apr_private.h"
/* System Headers required for time library */
-#if HAVE_SYS_TIME_H
+#if APR_HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
-#if HAVE_TIME_H
+#ifdef HAVE_TIME_H
#include <time.h>
#endif
-#if HAVE_STRING_H
+#if APR_HAVE_STRING_H
#include <string.h>
#endif
/* End System Headers */
1.4 +0 -3 apr/user/win32/groupinfo.c
Index: groupinfo.c
===================================================================
RCS file: /home/cvs/apr/user/win32/groupinfo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- groupinfo.c 2001/02/16 04:16:24 1.3
+++ groupinfo.c 2001/02/25 20:39:41 1.4
@@ -56,9 +56,6 @@
#include "apr_portable.h"
#include "apr_user.h"
#include "apr_private.h"
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
