Move apr_private.h.in from the include directory to the arch/unix

directory.  This removes all temptation to include apr_private.h from
outside of APR, because it just isn't available.  This also highlighted
a bunch of holes in our header file setup.  Basically, just directories
that were never migrated to the curret setup.
Submitted by:	Will Rowe and Ryan Bloom


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

16 files changed, 414 insertions, 20 deletions

diff --git a/configure.in b/configure.in
index 9ddd4d392..4ff235d7f 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl ##
 
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(apr_common.m4)
-AC_CONFIG_HEADER(include/apr_private.h)
+AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
 AC_CONFIG_AUX_DIR(helpers)
 
 AC_CANONICAL_SYSTEM
@@ -801,7 +801,7 @@ if test -n "$CPPFLAGS"; then
   CFLAGS="$CFLAGS $CPPFLAGS"
 fi
 
-SAVE_FILES="include/apr.h include/apr_private.h"
+SAVE_FILES="include/apr.h include/arch/unix/apr_private.h"
 
 for i in $SAVE_FILES; do
   test -r $i && mv $i $i.save
diff --git a/i18n/unix/Makefile.in b/i18n/unix/Makefile.in
index 9d99037c8..0e35098c0 100644
--- a/i18n/unix/Makefile.in
+++ b/i18n/unix/Makefile.in
@@ -4,8 +4,9 @@ RANLIB=@RANLIB@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
 INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
 MKDEP=../../helpers/mkdep.sh
 
 OBJS=xlate.o
diff --git a/include/arch/unix/apr_private.h.in b/include/arch/unix/apr_private.h.in
new file mode 100644
index 000000000..5a45825f8
--- /dev/null
+++ b/include/arch/unix/apr_private.h.in
@@ -0,0 +1,390 @@
+/* include/arch/unix/apr_private.h.in.  Generated automatically from configure.in by autoheader.  */
+#ifndef APR_PRIVATE_H
+#define APR_PRIVATE_H
+
+
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+#undef _ALL_SOURCE
+#endif
+
+/* Define to empty if the keyword does not work.  */
+#undef const
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef gid_t
+
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
+
+/* Define to `long' if <sys/types.h> doesn't define.  */
+#undef off_t
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef pid_t
+
+/* Define if the `setpgrp' function takes no argument.  */
+#undef SETPGRP_VOID
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+#undef size_t
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef uid_t
+
+/* Various #defines we need to know about */
+#undef HAVE_LOCK_EX
+#undef HAVE_F_SETLK
+#undef HAVE_CODESET
+#undef HAVE_PTHREAD_PROCESS_SHARED
+#undef DEV_RANDOM
+#undef HAVE_TRUERAND
+#undef HAVE_POLLIN
+#undef HAVE_isascii
+
+#undef READDIR_IS_THREAD_SAFE
+
+#undef NEED_RLIM_T
+#undef USEBCOPY
+
+#undef HAVE_GMTOFF
+#undef USE_THREADS
+
+#undef SIZEOF_SSIZE_T
+#undef SIZEOF_SIZE_T
+#undef SIZEOF_OFF_T
+
+#undef HAVE_MM_SHMT_MMFILE
+
+/* BeOS specific flag */
+#undef HAVE_BONE_VERSION
+
+/* The number of bytes in a char.  */
+#undef SIZEOF_CHAR
+
+/* The number of bytes in a int.  */
+#undef SIZEOF_INT
+
+/* The number of bytes in a long.  */
+#undef SIZEOF_LONG
+
+/* The number of bytes in a long double.  */
+#undef SIZEOF_LONG_DOUBLE
+
+/* The number of bytes in a long long.  */
+#undef SIZEOF_LONG_LONG
+
+/* The number of bytes in a short.  */
+#undef SIZEOF_SHORT
+
+/* Define if you have the bzero function.  */
+#undef HAVE_BZERO
+
+/* Define if you have the dlopen function.  */
+#undef HAVE_DLOPEN
+
+/* Define if you have the fork function.  */
+#undef HAVE_FORK
+
+/* Define if you have the getipnodebyaddr function.  */
+#undef HAVE_GETIPNODEBYADDR
+
+/* Define if you have the getipnodebyname function.  */
+#undef HAVE_GETIPNODEBYNAME
+
+/* Define if you have the getpass function.  */
+#undef HAVE_GETPASS
+
+/* Define if you have the getrlimit function.  */
+#undef HAVE_GETRLIMIT
+
+/* Define if you have the gmtime_r function.  */
+#undef HAVE_GMTIME_R
+
+/* Define if you have the hstrerror function.  */
+#undef HAVE_HSTRERROR
+
+/* Define if you have the iconv function.  */
+#undef HAVE_ICONV
+
+/* Define if you have the localtime_r function.  */
+#undef HAVE_LOCALTIME_R
+
+/* Define if you have the memmove function.  */
+#undef HAVE_MEMMOVE
+
+/* Define if you have the mmap function.  */
+#undef HAVE_MMAP
+
+/* Define if you have the nl_langinfo function.  */
+#undef HAVE_NL_LANGINFO
+
+/* Define if you have the poll function.  */
+#undef HAVE_POLL
+
+/* Define if you have the pthread_key_delete function.  */
+#undef HAVE_PTHREAD_KEY_DELETE
+
+/* Define if you have the semctl function.  */
+#undef HAVE_SEMCTL
+
+/* Define if you have the semget function.  */
+#undef HAVE_SEMGET
+
+/* Define if you have the send_file function.  */
+#undef HAVE_SEND_FILE
+
+/* Define if you have the sendfile function.  */
+#undef HAVE_SENDFILE
+
+/* Define if you have the setrlimit function.  */
+#undef HAVE_SETRLIMIT
+
+/* Define if you have the setsid function.  */
+#undef HAVE_SETSID
+
+/* Define if you have the sigaction function.  */
+#undef HAVE_SIGACTION
+
+/* Define if you have the strcasecmp function.  */
+#undef HAVE_STRCASECMP
+
+/* Define if you have the strdup function.  */
+#undef HAVE_STRDUP
+
+/* Define if you have the stricmp function.  */
+#undef HAVE_STRICMP
+
+/* Define if you have the strncasecmp function.  */
+#undef HAVE_STRNCASECMP
+
+/* Define if you have the strnicmp function.  */
+#undef HAVE_STRNICMP
+
+/* Define if you have the strstr function.  */
+#undef HAVE_STRSTR
+
+/* Define if you have the waitpid function.  */
+#undef HAVE_WAITPID
+
+/* Define if you have the writev function.  */
+#undef HAVE_WRITEV
+
+/* Define if you have the <ByteOrder.h> header file.  */
+#undef HAVE_BYTEORDER_H
+
+/* Define if you have the <arpa/inet.h> header file.  */
+#undef HAVE_ARPA_INET_H
+
+/* Define if you have the <conio.h> header file.  */
+#undef HAVE_CONIO_H
+
+/* Define if you have the <crypt.h> header file.  */
+#undef HAVE_CRYPT_H
+
+/* Define if you have the <ctype.h> header file.  */
+#undef HAVE_CTYPE_H
+
+/* Define if you have the <dir.h> header file.  */
+#undef HAVE_DIR_H
+
+/* Define if you have the <dirent.h> header file.  */
+#undef HAVE_DIRENT_H
+
+/* Define if you have the <dl.h> header file.  */
+#undef HAVE_DL_H
+
+/* Define if you have the <dlfcn.h> header file.  */
+#undef HAVE_DLFCN_H
+
+/* Define if you have the <errno.h> header file.  */
+#undef HAVE_ERRNO_H
+
+/* Define if you have the <fcntl.h> header file.  */
+#undef HAVE_FCNTL_H
+
+/* Define if you have the <iconv.h> header file.  */
+#undef HAVE_ICONV_H
+
+/* Define if you have the <io.h> header file.  */
+#undef HAVE_IO_H
+
+/* Define if you have the <kernel/OS.h> header file.  */
+#undef HAVE_KERNEL_OS_H
+
+/* Define if you have the <langinfo.h> header file.  */
+#undef HAVE_LANGINFO_H
+
+/* Define if you have the <limits.h> header file.  */
+#undef HAVE_LIMITS_H
+
+/* Define if you have the <malloc.h> header file.  */
+#undef HAVE_MALLOC_H
+
+/* Define if you have the <memory.h> header file.  */
+#undef HAVE_MEMORY_H
+
+/* Define if you have the <net/errno.h> header file.  */
+#undef HAVE_NET_ERRNO_H
+
+/* Define if you have the <netdb.h> header file.  */
+#undef HAVE_NETDB_H
+
+/* Define if you have the <netinet/in.h> header file.  */
+#undef HAVE_NETINET_IN_H
+
+/* Define if you have the <netinet/tcp.h> header file.  */
+#undef HAVE_NETINET_TCP_H
+
+/* Define if you have the <osreldate.h> header file.  */
+#undef HAVE_OSRELDATE_H
+
+/* Define if you have the <poll.h> header file.  */
+#undef HAVE_POLL_H
+
+/* Define if you have the <process.h> header file.  */
+#undef HAVE_PROCESS_H
+
+/* Define if you have the <pthread.h> header file.  */
+#undef HAVE_PTHREAD_H
+
+/* Define if you have the <pwd.h> header file.  */
+#undef HAVE_PWD_H
+
+/* Define if you have the <signal.h> header file.  */
+#undef HAVE_SIGNAL_H
+
+/* Define if you have the <stdarg.h> header file.  */
+#undef HAVE_STDARG_H
+
+/* Define if you have the <stddef.h> header file.  */
+#undef HAVE_STDDEF_H
+
+/* Define if you have the <stdio.h> header file.  */
+#undef HAVE_STDIO_H
+
+/* Define if you have the <stdlib.h> header file.  */
+#undef HAVE_STDLIB_H
+
+/* Define if you have the <string.h> header file.  */
+#undef HAVE_STRING_H
+
+/* Define if you have the <strings.h> header file.  */
+#undef HAVE_STRINGS_H
+
+/* Define if you have the <sys/file.h> header file.  */
+#undef HAVE_SYS_FILE_H
+
+/* Define if you have the <sys/mman.h> header file.  */
+#undef HAVE_SYS_MMAN_H
+
+/* Define if you have the <sys/poll.h> header file.  */
+#undef HAVE_SYS_POLL_H
+
+/* Define if you have the <sys/resource.h> header file.  */
+#undef HAVE_SYS_RESOURCE_H
+
+/* Define if you have the <sys/select.h> header file.  */
+#undef HAVE_SYS_SELECT_H
+
+/* Define if you have the <sys/sem.h> header file.  */
+#undef HAVE_SYS_SEM_H
+
+/* Define if you have the <sys/sendfile.h> header file.  */
+#undef HAVE_SYS_SENDFILE_H
+
+/* Define if you have the <sys/signal.h> header file.  */
+#undef HAVE_SYS_SIGNAL_H
+
+/* Define if you have the <sys/socket.h> header file.  */
+#undef HAVE_SYS_SOCKET_H
+
+/* Define if you have the <sys/stat.h> header file.  */
+#undef HAVE_SYS_STAT_H
+
+/* Define if you have the <sys/time.h> header file.  */
+#undef HAVE_SYS_TIME_H
+
+/* Define if you have the <sys/types.h> header file.  */
+#undef HAVE_SYS_TYPES_H
+
+/* Define if you have the <sys/uio.h> header file.  */
+#undef HAVE_SYS_UIO_H
+
+/* Define if you have the <sys/wait.h> header file.  */
+#undef HAVE_SYS_WAIT_H
+
+/* Define if you have the <sysapi.h> header file.  */
+#undef HAVE_SYSAPI_H
+
+/* Define if you have the <sysgtime.h> header file.  */
+#undef HAVE_SYSGTIME_H
+
+/* Define if you have the <termios.h> header file.  */
+#undef HAVE_TERMIOS_H
+
+/* Define if you have the <time.h> header file.  */
+#undef HAVE_TIME_H
+
+/* Define if you have the <tpfeq.h> header file.  */
+#undef HAVE_TPFEQ_H
+
+/* Define if you have the <tpfio.h> header file.  */
+#undef HAVE_TPFIO_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if you have the <unix.h> header file.  */
+#undef HAVE_UNIX_H
+
+/* Define if you have the iconv library (-liconv).  */
+#undef HAVE_LIBICONV
+
+/* Define if you have the nsl library (-lnsl).  */
+#undef HAVE_LIBNSL
+
+/* Define if you have the socket library (-lsocket).  */
+#undef HAVE_LIBSOCKET
+
+/* Define if you have the truerand library (-ltruerand).  */
+#undef HAVE_LIBTRUERAND
+
+/* Define if system uses EBCDIC */
+#undef CHARSET_EBCDIC
+
+/* Whether you have socklen_t */
+#undef HAVE_SOCKLEN_T
+
+/* Define if pthread_getspecific() has two args */
+#undef PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS
+
+/* Define if pthread_attr_getdetachstate() has one arg */
+#undef PTHREAD_ATTR_GETDETACHSTATE_TAKES_ONE_ARG
+
+/* Define if we have length field in sockaddr_in */
+#undef HAVE_SOCKADDR_SA_LEN
+
+/* Define if gethostbyname() handles nnn.nnn.nnn.nnn */
+#undef GETHOSTBYNAME_HANDLES_NAS
+
+/* Define if getaddrinfo exists and works well enough for APR */
+#undef HAVE_GETADDRINFO
+
+
+/* Make sure we have ssize_t defined to be something */
+#undef ssize_t
+
+/* switch this on if we have a BeOS version below BONE */
+#if BEOS && !HAVE_BONE_VERSION
+#define BEOS_R5 1
+#else
+#define BEOS_BONE 1
+#endif
+
+#endif /* APR_PRIVATE_H */
diff --git a/mmap/unix/Makefile.in b/mmap/unix/Makefile.in
index 5ac7b6b27..9fc7221ba 100644
--- a/mmap/unix/Makefile.in
+++ b/mmap/unix/Makefile.in
@@ -4,8 +4,9 @@ RANLIB=@RANLIB@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
 INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
 MKDEP=../../helpers/mkdep.sh
 
 LIB=libmmap.a
diff --git a/mmap/unix/mmap.c b/mmap/unix/mmap.c
index 8b8b5440d..77c1d5ce8 100644
--- a/mmap/unix/mmap.c
+++ b/mmap/unix/mmap.c
@@ -57,7 +57,7 @@
 #include "apr_general.h"
 #include "apr_mmap.h"
 #include "apr_errno.h"
-#include "unix/fileio.h"
+#include "fileio.h"
 #include "apr_portable.h"
 
 /* System headers required for the mmap library */
diff --git a/passwd/Makefile.in b/passwd/Makefile.in
index fccf3f316..b4c08ad47 100644
--- a/passwd/Makefile.in
+++ b/passwd/Makefile.in
@@ -6,7 +6,8 @@ CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
 INCDIR=../include
-INCLUDES=-I$(INCDIR)
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
 MKDEP=../helpers/mkdep.sh
 
 OBJS=apr_md5.o \
diff --git a/strings/Makefile.in b/strings/Makefile.in
index 1871bb83f..2c10f2c23 100644
--- a/strings/Makefile.in
+++ b/strings/Makefile.in
@@ -5,8 +5,9 @@ RM=@RM@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
 INCDIR=../include
-INCLUDES=-I$(INCDIR)
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
 MKDEP=../helpers/mkdep.sh
 
 OBJS=apr_cpystrn.o \
diff --git a/tables/Makefile.in b/tables/Makefile.in
index f09cf74f0..05aa28c76 100644
--- a/tables/Makefile.in
+++ b/tables/Makefile.in
@@ -5,8 +5,9 @@ RM=@RM@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
 INCDIR=../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
 MKDEP=../helpers/mkdep.sh
 
 OBJS=apr_tables.o \
diff --git a/threadproc/unix/Makefile.in b/threadproc/unix/Makefile.in
index 7b157771d..ea97d6c3c 100644
--- a/threadproc/unix/Makefile.in
+++ b/threadproc/unix/Makefile.in
@@ -5,7 +5,8 @@ CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
 INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
 MKDEP=../../helpers/mkdep.sh
 
 LIB=libthreadproc.a
diff --git a/threadproc/unix/proc.c b/threadproc/unix/proc.c
index 311b7520b..6f91f21e4 100644
--- a/threadproc/unix/proc.c
+++ b/threadproc/unix/proc.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "unix/threadproc.h"
+#include "threadproc.h"
 #include "apr_strings.h"
 #include "apr_portable.h"
 
diff --git a/threadproc/unix/procsup.c b/threadproc/unix/procsup.c
index 73215e4d7..e29954cda 100644
--- a/threadproc/unix/procsup.c
+++ b/threadproc/unix/procsup.c
@@ -52,7 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#include "unix/threadproc.h"
+#include "threadproc.h"
 
 apr_status_t apr_detach(void)
 {
diff --git a/threadproc/unix/signals.c b/threadproc/unix/signals.c
index e0ce0cf2a..cd561fa82 100644
--- a/threadproc/unix/signals.c
+++ b/threadproc/unix/signals.c
@@ -52,11 +52,7 @@
  * <http://www.apache.org/>.
  */
 
-#ifndef BEOS
-#include "unix/threadproc.h"
-#else
-#include "beos/threadproc.h"
-#endif
+#include "threadproc.h"
 #include "apr_private.h"
 #include "apr_lib.h"
 #if APR_HAVE_SIGNAL_H
diff --git a/threadproc/unix/thread.c b/threadproc/unix/thread.c
index 896df2543..c083fb89e 100644
--- a/threadproc/unix/thread.c
+++ b/threadproc/unix/thread.c
@@ -54,7 +54,7 @@
 
 #include "apr.h"
 #include "apr_portable.h"
-#include "unix/threadproc.h"
+#include "threadproc.h"
 
 #if APR_HAS_THREADS
 
diff --git a/threadproc/unix/threadpriv.c b/threadproc/unix/threadpriv.c
index cb7a995fb..9843f2e91 100644
--- a/threadproc/unix/threadpriv.c
+++ b/threadproc/unix/threadpriv.c
@@ -54,7 +54,7 @@
 
 #include "apr.h"
 #include "apr_portable.h"
-#include "unix/threadproc.h"
+#include "threadproc.h"
 
 #if APR_HAS_THREADS
 
diff --git a/time/unix/Makefile.in b/time/unix/Makefile.in
index 925a62840..b3134bc9f 100644
--- a/time/unix/Makefile.in
+++ b/time/unix/Makefile.in
@@ -4,8 +4,9 @@ RANLIB=@RANLIB@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
 INCDIR=../../include
-INCLUDES=-I$(INCDIR)
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
 MKDEP=../../helpers/mkdep.sh
 
 OBJS=time.o \
diff --git a/user/unix/Makefile.in b/user/unix/Makefile.in
index ebfdad496..22642134b 100644
--- a/user/unix/Makefile.in
+++ b/user/unix/Makefile.in
@@ -5,7 +5,8 @@ CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
 INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
 MKDEP=../../helpers/mkdep.sh
 
 OBJS=homedir.o