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.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61303 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 37 insertions, 39 deletions

diff --git a/include/apr.h.in b/include/apr.h.in
index 13a09a4ec..8d8a802af 100644
--- a/include/apr.h.in
+++ b/include/apr.h.in
@@ -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@
 
diff --git a/include/apr.hw b/include/apr.hw
index bdb105cc9..e5cc8589f 100644
--- a/include/apr.hw
+++ b/include/apr.hw
@@ -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
 
diff --git a/include/arch/os2/networkio.h b/include/arch/os2/networkio.h
index 79534d7c6..64ed34a7e 100644
--- a/include/arch/os2/networkio.h
+++ b/include/arch/os2/networkio.h
@@ -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
 
diff --git a/include/arch/unix/fileio.h b/include/arch/unix/fileio.h
index 3019db825..3d71a4367 100644
--- a/include/arch/unix/fileio.h
+++ b/include/arch/unix/fileio.h
@@ -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
diff --git a/include/arch/unix/locks.h b/include/arch/unix/locks.h
index e1cfc3b7e..b71638a0b 100644
--- a/include/arch/unix/locks.h
+++ b/include/arch/unix/locks.h
@@ -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
diff --git a/include/arch/unix/misc.h b/include/arch/unix/misc.h
index 0849b5ef3..696943772 100644
--- a/include/arch/unix/misc.h
+++ b/include/arch/unix/misc.h
@@ -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
 
diff --git a/include/arch/unix/networkio.h b/include/arch/unix/networkio.h
index 5890de68e..df1b5d12f 100644
--- a/include/arch/unix/networkio.h
+++ b/include/arch/unix/networkio.h
@@ -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 */
diff --git a/include/arch/unix/threadproc.h b/include/arch/unix/threadproc.h
index 489bb0114..c14270dd3 100644
--- a/include/arch/unix/threadproc.h
+++ b/include/arch/unix/threadproc.h
@@ -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 */
diff --git a/include/arch/win32/apr_private.h b/include/arch/win32/apr_private.h
index c993ed771..d2cbc8ded 100644
--- a/include/arch/win32/apr_private.h
+++ b/include/arch/win32/apr_private.h
@@ -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
diff --git a/include/arch/win32/fileio.h b/include/arch/win32/fileio.h
index 6c56a4c15..71dd541af 100644
--- a/include/arch/win32/fileio.h
+++ b/include/arch/win32/fileio.h
@@ -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
@@ -84,9 +84,6 @@
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
-#ifdef HAVE_UIO_H
-#include <sys/uio.h>
-#endif
 
 #if APR_HAS_UNICODE_FS
 #include "i18n.h"
diff --git a/include/arch/win32/misc.h b/include/arch/win32/misc.h
index 0849b5ef3..696943772 100644
--- a/include/arch/win32/misc.h
+++ b/include/arch/win32/misc.h
@@ -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