rbb 99/07/13 12:51:42
Modified: apr configure.in
apr/include apr_config.h.in apr_lib.h apr_md5.h apr_pools.h
apr/lib apr_cpystrn.c apr_signal.c
apr/locks/unix locks.h
apr/signal/unix signal.c
apr/threadproc/unix procsup.c
include apr_general.h apr_portable.h
Added: apr acconfig.h
Log:
First pass at using autoconf with autoheader. This compiles, but not all
of the work has been done yet.
Revision Changes Path
1.27 +25 -0 apache-apr/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure.in 1999/07/12 18:38:19 1.26
+++ configure.in 1999/07/13 19:51:20 1.27
@@ -15,6 +15,9 @@
AC_CHECK_PROG(RM, rm, rm)
AC_CHECK_PROG(AR, ar, ar)
+# This macro needs to be here in case we are on an AIX box.
+AC_AIX
+
dnl Checks for integer size
AC_CHECK_SIZEOF(char, 1)
AC_CHECK_SIZEOF(int, 4)
@@ -23,6 +26,14 @@
AC_CHECK_SIZEOF(long double, 12)
AC_CHECK_SIZEOF(long long, 8)
+dnl Checks for standard typedefs
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_UID_T
+AC_CHECK_TYPE(ssize_t, int)
+AC_C_INLINE
+
# Use /bin/sh if it exists, otherwise go looking for sh in the path
if (test -z "$SH" -a -e /bin/sh); then
SH="/bin/sh"
@@ -171,8 +182,22 @@
AC_FUNC_MMAP
AC_FUNC_SETPGRP
+AC_MSG_CHECKING(looking for union semun in sys/sem.h)
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+],[
+union semun arg;
+semctl(0, 0, 0, arg);
+], AC_DEFINE(HAVE_STRUCT_UNION_SEMUN)
+msg=yes,dnl
+msg=no)
+AC_MSG_RESULT([$msg])
+
dnl Checks for library functions.
AC_CHECK_FUNCS(strcasecmp stricmp poll setsid)
+AC_CHECK_FUNCS(sigaction)
dnl Start building stuff from our information
AC_SUBST(LDLIBS)
1.1 apache-apr/apr/acconfig.h
Index: acconfig.h
===================================================================
#ifndef APR_CONFIG_H
#define APR_CONFIG_H
@TOP@
#undef HAVE_STRUCT_UNION_SEMUN
#undef NEED_RLIM_T
#undef USEBCOPY
@BOTTOM@
#define API_EXPORT(type) type
#define API_EXPORT_NONSTD(type) type
/* Make sure we have ssize_t defined to be somethine */
#undef ssize_t
/* We want this in config.h, because it is a macro that Windows requires.
This
* way, every thread start function has this definition, and things are happy.
*/
#define API_THREAD_FUNC
#ifdef HAVE_SIGACTION
typedef void Sigfunc(int);
#if defined(SIG_ING) && !defined(SIG_ERR)
#define SIG_ERR ((Sigfunc *)-1)
#endif
#define signal(s,f) ap_signal(s, f)
Sigfunc *signal(int signo, Sigfunc * func);
#endif
#endif /* APR_CONFIG_H */
1.11 +173 -435 apache-apr/apr/include/apr_config.h.in
Index: apr_config.h.in
===================================================================
RCS file: /home/cvs/apache-apr/apr/include/apr_config.h.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apr_config.h.in 1999/06/30 19:45:35 1.10
+++ apr_config.h.in 1999/07/13 19:51:23 1.11
@@ -1,510 +1,248 @@
-/*
- * Include all of the system header files appropriate for this platform,
- * and make library-wide definitions.
- */
+/* include/apr_config.h.in. Generated automatically from configure.in by
autoheader. */
#ifndef APR_CONFIG_H
#define APR_CONFIG_H
-/*
- * Just in case someone's building with a C++ compiler, isolate our
- * work appropriately.
- */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+/* 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
-/*
- * List of header files which exist for this platform.
- */
-#undef HAVE_CRYPT_H
-#undef HAVE_CTYPE_H
-#undef HAVE_DIR_H
-#undef HAVE_DIRENT_H
-#undef HAVE_ERRNO_H
-#undef HAVE_NET_ERRNO_H
-#undef HAVE_FCNTL_H
-#undef HAVE_FEATURES_H
-#undef HAVE_GRP_Ho
-#undef HAVE_IO_H
-#undef HAVE_LIMITS_H
-#undef HAVE_MALLOC_H
-#undef HAVE_MATH_H
-#undef HAVE_MEMORY_H
-#undef HAVE_NETDB_H
-#undef HAVE_OSRELDATE_H
-#undef HAVE_PROCESS_H
-#undef HAVE_PWD_H
-#undef HAVE_SETJMP_H
-#undef HAVE_SIGNAL_H
-#undef HAVE_STDARG_H
-#undef HAVE_STDDEF_H
-#undef HAVE_STDIO_H
-#undef HAVE_STDLIB_H
-#undef HAVE_STRING_H
-#undef HAVE_SYSAPI_H
-#undef HAVE_SYSGTIME_H
-#undef HAVE_TIME_H
-#undef HAVE_SYS_TIME_H
-#undef HAVE_SYS_TIMES_H
-#undef HAVE_TPFEQ_H
-#undef HAVE_TPFIO_H
-#undef HAVE_UNISTD_H
-#undef HAVE_UNIX_H
-#undef HAVE_WINSOCK_H
+/* Define to empty if the keyword does not work. */
+#undef const
-#undef HAVE_ARPA_INET_H
-#undef HAVE_NETINET_IN_H
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef gid_t
-#undef HAVE_SYS_FILE_H
-#undef HAVE_SYS_IOCTL_H
-#undef HAVE_SYS_MMAN_H
-#undef HAVE_SYS_PARAM_H
-#undef HAVE_SYS_RESOURCE_H
-#undef HAVE_SYS_SELECT_H
-#undef HAVE_SYS_SOCKET_H
-#undef HAVE_SYS_STAT_H
-#undef HAVE_SYS_TYPES_H
-#undef HAVE_SYS_WAIT_H
+/* Define if you have a working `mmap' system call. */
+#undef HAVE_MMAP
-#undef HAVE_PTHREAD_H
+/* Define as __inline if that's what the C compiler calls it. */
+#undef inline
-/*
- * List of features/library functions available, which we'll use if
- * they're compatible.
- */
-#undef HAVE_MMAP
-#undef HAVE_STRCASECMP
-#undef HAVE_STRICMP
-#undef HAVE_POLL
-#undef HAVE_SETSID
-/*
- * Known problems with system header files that we can fix.
- */
+/* Define to `long' if <sys/types.h> doesn't define. */
+#undef off_t
-/*
- * Versions of Ultrix prior to 4.3 included a bundled cc with a broken
- * const. Don't try to use it; in fact, make sure it's define'd away
- * before any header files try to use it.
- */
-#ifdef ULTRIX
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef pid_t
-#ifdef __ultrix__
-#define const
-#endif /* __ultrix__ */
+/* Define if the `setpgrp' function takes no argument. */
+#undef SETPGRP_VOID
-#endif /* ULTRIX */
+/* Define to `unsigned' if <sys/types.h> doesn't define. */
+#undef size_t
-/*
- * We now know what we have, so make use of it.
- */
+/* 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
+
+#undef HAVE_STRUCT_UNION_SEMUN
+#undef NEED_RLIM_T
+#undef USEBCOPY
+
+/* The number of bytes in a char. */
+#undef SIZEOF_CHAR
+
+/* The number of bytes in a int. */
+#undef SIZEOF_INT
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif /* HAVE_SYS_TYPES_H */
+/* The number of bytes in a long. */
+#undef SIZEOF_LONG
-#ifdef HAVE_CRYPT_H
-#include <crypt.h>
-#endif /* HAVE_CRYPT_H */
+/* The number of bytes in a long double. */
+#undef SIZEOF_LONG_DOUBLE
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif /* HAVE_CTYPE_H */
+/* The number of bytes in a long long. */
+#undef SIZEOF_LONG_LONG
-#ifdef HAVE_DIR_H
-#include <dir.h>
-#endif /* HAVE_DIR_H */
+/* The number of bytes in a short. */
+#undef SIZEOF_SHORT
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif /* HAVE_DIRENT_H */
+/* Define if you have the getpagesize function. */
+#undef HAVE_GETPAGESIZE
+
+/* Define if you have the poll function. */
+#undef HAVE_POLL
+
+/* 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 stricmp function. */
+#undef HAVE_STRICMP
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif /* HAVE_ERRNO_H */
+/* Define if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
-#ifdef HAVE_NET_ERRNO_H
-#include <net/errno.h>
-#endif /* HAVE_NET_ERRNO_H */
+/* Define if you have the <crypt.h> header file. */
+#undef HAVE_CRYPT_H
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
+/* Define if you have the <ctype.h> header file. */
+#undef HAVE_CTYPE_H
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif /* HAVE_GRP_H */
+/* Define if you have the <dir.h> header file. */
+#undef HAVE_DIR_H
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif /* HAVE_IO_H */
+/* Define if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif /* HAVE_LIMITS_H */
+/* Define if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif /* HAVE_MALLOC_H */
+/* Define if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif /* HAVE_MATH_H */
+/* Define if you have the <features.h> header file. */
+#undef HAVE_FEATURES_H
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif /* HAVE_MEMORY_H */
+/* Define if you have the <grp.h> header file. */
+#undef HAVE_GRP_H
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif /* HAVE_NETDB_H */
+/* Define if you have the <io.h> header file. */
+#undef HAVE_IO_H
+/* Define if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
-#ifdef HAVE_PROCESS_H
-#include <process.h>
-#endif /* HAVE_PROCESS_H */
+/* Define if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif /* HAVE_PWD_H */
+/* Define if you have the <math.h> header file. */
+#undef HAVE_MATH_H
-#ifdef HAVE_SETJMP_H
-#include <setjmp.h>
-#endif /* HAVE_SETJMP_H */
+/* Define if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif /* HAVE_SIGNAL_H */
+/* Define if you have the <net/errno.h> header file. */
+#undef HAVE_NET_ERRNO_H
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif /* HAVE_STDARG_H */
+/* Define if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif /* HAVE_STDDEF_H */
+/* Define if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif /* HAVE_STDIO_H */
+/* Define if you have the <osreldate.h> header file. */
+#undef HAVE_OSRELDATE_H
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif /* HAVE_STDLIB_H */
+/* Define if you have the <process.h> header file. */
+#undef HAVE_PROCESS_H
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif /* HAVE_STRING_H */
+/* Define if you have the <pthread.h> header file. */
+#undef HAVE_PTHREAD_H
-/*
- * Some sole-platform inclusions.
- */
-#ifdef TPF
+/* Define if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
-#ifdef HAVE_TPFEQ_H
-#include <tpfeq.h>
-#endif /* HAVE_TPFEQ_H */
+/* Define if you have the <setjmp.h> header file. */
+#undef HAVE_SETJMP_H
-#ifdef HAVE_TPFIO_H
-#include <tpfio.h>
-#endif /* HAVE_TPFIO_H */
+/* Define if you have the <signal.h> header file. */
+#undef HAVE_SIGNAL_H
-#ifdef HAVE_OSRELDATE_H
-#include <osreldate.h>
-#endif /* HAVE_OSRELDATE_H */
+/* Define if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
-#ifdef HAVE_SYSAPI_H
-#include <sysapi.h>
-#endif /* HAVE_SYSAPI_H */
+/* Define if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
-#ifdef HAVE_SYSGTIME_H
-#include <sysgtime.h>
-#endif /* HAVE_SYSGTIME_H */
+/* Define if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
-#endif /* TPF */
+/* Define if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif /* HAVE_TIME_H */
+/* Define if you have the <string.h> header file. */
+#undef HAVE_STRING_H
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif /* HAVE_SYS_TIME_H */
+/* Define if you have the <sys/file.h> header file. */
+#undef HAVE_SYS_FILE_H
-#ifdef HAVE_SYS_TIMES_H
-#include <sys/times.h>
-#endif /* HAVE_SYS_TIMES_H */
+/* Define if you have the <sys/ioctl.h> header file. */
+#undef HAVE_SYS_IOCTL_H
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+/* Define if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
-#ifdef HAVE_UNIX_H
-#include <unix.h>
-#endif /* HAVE_UNIX_H */
+/* Define if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif /* HAVE_NETINET_IN_H */
+/* Define if you have the <sys/resource.h> header file. */
+#undef HAVE_SYS_RESOURCE_H
-/*
- * Header files to include *except* for a particular platform.
- */
-#ifndef OS2
+/* Define if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif /* HAVE_ARPA_INET_H */
-
-#endif /* OS2 */
-
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif /* HAVE_SYS_FILE_H */
-
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif /* HAVE_SYS_IOCTL_H */
-
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif /* HAVE_SYS_MMAN_H */
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif /* HAVE SYS_PARAM_H */
-
-#ifndef ULTRIX
-/*
- * We don't want to include Ultrix's sys/resource.h, even if it's
- * there.
- */
+/* Define if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif /* HAVE_SYS_RESOURCE_H */
-
-#endif /* ULTRIX */
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif /* HAVE_SYS_SELECT_H */
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif /* HAVE SYS_SOCKET_H */
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif /* HAVE_SYS_STAT_H */
-
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif /* HAVE_SYS_WAIT_H */
+/* Define if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
-/*
- * End of include-file processing.
- */
+/* Define if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
-/*
- * Platform-specific definitions.
- */
-#ifdef _OSD_POSIX
-#define NEED_HASHBANG_EMUL
-#undef bzero
-#endif /* _OSD_POSIX */
-
-#ifdef UTS21
-#define NEED_HASHBANG_EMUL
-#define NO_USE_SIGACTION
-#endif /* UTS1 */
-
-#ifdef TPF
-#define NO_USE_SIGACTION
-#define NO_SLACK
-#endif /* TPF */
-
-#ifdef LYNXOS
-#define NO_USE_SIGACTION
-#endif /* LYNXOS */
-
-#ifdef __MACHTEN__
-#define NO_USE_SIGACTION
-#endif /* __MACHTEN__ */
-
-#ifdef NEWOS
-#define NO_USE_SIGACTION
-#endif /* NEWOS */
-
-#ifdef RISCIX
-#define NO_USE_SIGACTION
-#endif /* RISCIX */
-
-#ifdef MPE
-#define NO_SLACK
-#endif /* MPE */
-
-#ifdef AUX3
-#define NO_SLACK
-#endif /* AUX3 */
-
-#ifdef NEXT
-#define NO_USE_SIGACTION
-#endif /* NEXT */
-
-/*
- * IF we're on a Linux platform, AND the kernel is 2.0 or later, AND
- * we have the features.h header file available, include it.
- */
-#ifdef LINUX
+/* Define if you have the <sys/times.h> header file. */
+#undef HAVE_SYS_TIMES_H
-#if (LINUX >= 20) && defined(HAVE_FEATURES_H)
-#include <features.h>
-#endif /* (LINUX >= 20) && defined(HAVE_FEATURES_H) */
+/* Define if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
-#endif /* LINUX */
+/* Define if you have the <sys/wait.h> header file. */
+#undef HAVE_SYS_WAIT_H
-/*
- * Now things that are dependent upon our derived platform settings.
- */
-#ifdef NEED_HASHBANG_MULTI
-extern int apr_execle(const char *filename, const char *arg,...);
-extern int apr_execve(const char *filename, const char *argv[],
- const char *envp[]);
-/*
- * apr_execle() is a wrapper function around apr_execve().
- */
-#define execle apr_execle
-#define execve(path,argv,envp) apr_execve(path,argv,envp)
-#endif /* NEED_HASHBANG_MULTI */
-
-#ifdef CHARSET_EBCDIC
-#include "ebcdic.h"
-#endif /* CHARSET_EBCDIC */
-
-#ifndef NO_USE_SIGACTION
-/*
- * Replace signal function with sigaction equivalent
- */
-typedef void Sigfunc(int);
+/* Define if you have the <sysapi.h> header file. */
+#undef HAVE_SYSAPI_H
-#if defined(SIG_IGN) && !defined(SIG_ERR)
-#define SIG_ERR ((Sigfunc *)-1)
-#endif /* defined(SIG_IGN) && !defined(SIG_ERR) */
+/* Define if you have the <sysgtime.h> header file. */
+#undef HAVE_SYSGTIME_H
-/*
- * For some strange reason, QNX defines signal to signal. Eliminate it.
- */
-#ifdef signal
-#undef signal
-#endif /* signal */
-#define signal(s,f) apr_signal(s,f)
-Sigfunc *signal(int signo, Sigfunc * func);
+/* Define if you have the <time.h> header file. */
+#undef HAVE_TIME_H
-#endif /* NO_USE_SIGACTION */
+/* Define if you have the <tpfeq.h> header file. */
+#undef HAVE_TPFEQ_H
-/*
- * Reserve some filehandles to workaround problems in many
- * third party libraries that are compiled with a small FD_SETSIZE. There
- * should be no reason to lower this, because it's only advisory. If a file
- * can't be allocated above this number then it will remain in the "slack"
- * area.
- *
- * Only the low slack line is used by default. If HIGH_SLACK_LINE is defined
- * then an attempt is also made to keep all non-FILE * files above the high
- * slack line. This is to work around a Solaris C library limitation, where
it
- * uses an unsigned char to store the file descriptor.
- */
-#ifndef LOW_SLACK_LINE
-#define LOW_SLACK_LINE 15
-#endif /* LOW_SLACK_LINE */
-/* #define HIGH_SLACK_LINE 255 */
-
-/*
- * The apr_slack() function takes a fd, and tries to move it above the
- * indicated line. It returns an fd which may or may not have moved
- * above the line, and never fails. If the high line was requested
- * and it fails it will also try the low line.
- */
-#ifdef NO_SLACK
-#define apr_slack(fd,line) (fd)
-#else /* NO_SLACK */
-int apr_slack(int fd, int line);
-#define APR_SLACK_LOW 1
-#define APR_SLACK_HIGH 2
-#endif /* NO_SLACK */
-
-/* So that we can use inline on some critical functions, and use
- * GNUC attributes (such as to get -Wall warnings for printf-like
- * functions). Only do this in gcc 2.7 or later ... it may work
- * on earlier stuff, but why chance it.
- *
- * We've since discovered that the gcc shipped with NeXT systems
- * as "cc" is completely broken. It claims to be __GNUC__ and so
- * on, but it doesn't implement half of the things that __GNUC__
- * means. In particular it's missing inline and the __attribute__
- * stuff. So we hack around it. PR#1613. -djg
- */
-#if !defined(__GNUC__) || (__GNUC__ < 2) \
- || ((__GNUC__ == 2) && (__GNUC_MINOR__ < 7)) \
- || defined(NEXT)
-#define APR_INLINE
-#define __attribute__(__x)
-#define ENUM_BITFIELD(e,n,w) signed int n : w
-#else
-#define APR_INLINE __inline__
-#define USE_GNU_INLINE
-#define ENUM_BITFIELD(e,n,w) e n : w
-#endif
+/* Define if you have the <tpfio.h> header file. */
+#undef HAVE_TPFIO_H
-#ifdef ULTRIX
-#define apr_fdopen(d,m) fdopen((d), (char *)(m))
-#else /* ULTRIX */
-#define apr_fdopen(d,m) fdopen((d), (m))
-#endif /* ULTRIX */
+/* Define if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
-/*
- * Begint he actual APR definitions .
- */
+/* Define if you have the <unix.h> header file. */
+#undef HAVE_UNIX_H
+/* Define if you have the <winsock.h> header file. */
+#undef HAVE_WINSOCK_H
#define API_EXPORT(type) type
#define API_EXPORT_NONSTD(type) type
-#define API_THREAD_FUNC
+/* Make sure we have ssize_t defined to be somethine */
+#undef ssize_t
-/*
- * A set of flags which indicate places where the server should
raise(SIGSTOP).
- * This is useful for debugging, because you can then attach to that process
- * with gdb and continue. This is important in cases where one_process
- * debugging isn't possible.
+/* We want this in config.h, because it is a macro that Windows requires.
This
+ * way, every thread start function has this definition, and things are
happy.
*/
-#define APR_SIGSTOP_DETACH 1
-#define APR_SIGSTOP_MAKE_CHILD 2
-#define APR_SIGSTOP_SPAWN_CHILD 4
-#define APR_SIGSTOP_PIPED_LOG_SPAWN 8
-#define APR_SIGSTOP_CGI_CHILD 16
-
-#ifdef DEBUG_SIGSTOP
-extern int raise_sigstop_flags;
-#define RAISE_SIGSTOP(x) \
- do { \
- if (raise_sigstop_flags & APR_SIGSTOP_##x) raise(SIGSTOP);\
- } while (0)
-#else
-#define RAISE_SIGSTOP(x)
+#define API_THREAD_FUNC
+
+#ifdef HAVE_SIGACTION
+typedef void Sigfunc(int);
+
+#if defined(SIG_ING) && !defined(SIG_ERR)
+#define SIG_ERR ((Sigfunc *)-1)
#endif
-#if !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP)
-#define strcasecmp stricmp
+#define signal(s,f) ap_signal(s, f)
+Sigfunc *signal(int signo, Sigfunc * func);
#endif
-/*
- * Close up the C++ enclosure.
- */
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-/*
- * End..
- */
-#endif /* ! APR_CONFIG_H */
+#endif /* APR_CONFIG_H */
1.11 +25 -0 apache-apr/apr/include/apr_lib.h
Index: apr_lib.h
===================================================================
RCS file: /home/cvs/apache-apr/apr/include/apr_lib.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apr_lib.h 1999/06/07 19:27:30 1.10
+++ apr_lib.h 1999/07/13 19:51:23 1.11
@@ -71,6 +71,31 @@
#include "apr_win.h"
#endif
#include "hsregex.h"
+#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.3 +5 -0 apache-apr/apr/include/apr_md5.h
Index: apr_md5.h
===================================================================
RCS file: /home/cvs/apache-apr/apr/include/apr_md5.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apr_md5.h 1999/06/01 18:15:17 1.2
+++ apr_md5.h 1999/07/13 19:51:23 1.3
@@ -92,6 +92,11 @@
#include "apr_win.h"
#endif
+#include "apr_lib.h"
+#ifdef HAVE_CRYPT_H
+#include <crypt.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
1.5 +4 -0 apache-apr/apr/include/apr_pools.h
Index: apr_pools.h
===================================================================
RCS file: /home/cvs/apache-apr/apr/include/apr_pools.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apr_pools.h 1999/06/02 18:44:36 1.4
+++ apr_pools.h 1999/07/13 19:51:25 1.5
@@ -89,6 +89,10 @@
#endif
#include "apr_lib.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+
struct process_chain {
pid_t pid;
enum kill_conditions kill_how;
1.3 +5 -0 apache-apr/apr/lib/apr_cpystrn.c
Index: apr_cpystrn.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/lib/apr_cpystrn.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apr_cpystrn.c 1999/06/01 18:15:25 1.2
+++ apr_cpystrn.c 1999/07/13 19:51:30 1.3
@@ -59,6 +59,11 @@
#else
#include "apr_win.h"
#endif
+
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
/*
* Apache's "replacement" for the strncpy() function. We roll our
* own to implement these specific changes:
1.2 +1 -0 apache-apr/apr/lib/apr_signal.c
Index: apr_signal.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/lib/apr_signal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_signal.c 1999/03/24 18:39:12 1.1
+++ apr_signal.c 1999/07/13 19:51:31 1.2
@@ -56,6 +56,7 @@
*/
#include "apr_config.h"
+#include "apr_lib.h"
#ifndef NO_USE_SIGACTION
/*
1.6 +1 -1 apache-apr/apr/locks/unix/locks.h
Index: locks.h
===================================================================
RCS file: /home/cvs/apache-apr/apr/locks/unix/locks.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- locks.h 1999/05/21 19:53:26 1.5
+++ locks.h 1999/07/13 19:51:34 1.6
@@ -71,7 +71,7 @@
#endif
#include <pthread.h>
-#ifdef NEED_UNION_SEMUN
+#ifndef HAVE_UNION_SEMUN
/* it makes no sense, but this isn't defined on solaris */
union semun {
long val;
1.2 +6 -0 apache-apr/apr/signal/unix/signal.c
Index: signal.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/signal/unix/signal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- signal.c 1999/06/30 19:45:43 1.1
+++ signal.c 1999/07/13 19:51:35 1.2
@@ -58,6 +58,12 @@
#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
+
ap_status_t ap_create_signal(ap_context_t *cont, ap_signum_t signum)
{
return APR_SUCCESS;
1.3 +1 -1 apache-apr/apr/threadproc/unix/procsup.c
Index: procsup.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/threadproc/unix/procsup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- procsup.c 1999/06/22 16:57:33 1.2
+++ procsup.c 1999/07/13 19:51:39 1.3
@@ -81,7 +81,7 @@
fprintf(stderr, "unable to fork new process\n");
exit(1); /* we can't do anything here, so just exit. */
}
- RAISE_SIGSTOP(DETACH);
+/* RAISE_SIGSTOP(DETACH);*/
#endif
#if HAVE_SETSID
if (((*new)->pid = setsid()) == -1) {
1.22 +5 -12 apache-apr/include/apr_general.h
Index: apr_general.h
===================================================================
RCS file: /home/cvs/apache-apr/include/apr_general.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- apr_general.h 1999/07/12 18:38:24 1.21
+++ apr_general.h 1999/07/13 19:51:41 1.22
@@ -108,18 +108,9 @@
typedef unsigned long double ap_uint64_t;
#endif
-typedef size_t ap_size_t;
-#ifdef ssize_t
-typedef ssize_t ap_ssize_t;
-#else
-typedef size_t ap_ssize_t;
-#endif
-
-#ifdef off_t
-typedef off_t ap_off_t;
-#else
-typedef size_t ap_off_t;
-#endif
+typedef size_t ap_size_t;
+typedef ssize_t ap_ssize_t;
+typedef off_t ap_off_t;
typedef struct context_t ap_context_t;
typedef int ap_signum_t;
@@ -214,6 +205,8 @@
#ifdef SIGIO
#define APR_SIGIO SIGIO
#endif
+
+#define APR_INLINE inline
/* Context functions */
ap_status_t ap_create_context(ap_context_t *, void *, ap_context_t **);
1.4 +10 -0 apache-apr/include/apr_portable.h
Index: apr_portable.h
===================================================================
RCS file: /home/cvs/apache-apr/include/apr_portable.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr_portable.h 1999/07/06 17:01:43 1.3
+++ apr_portable.h 1999/07/13 19:51:41 1.4
@@ -74,6 +74,16 @@
#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
+
#ifdef WIN32
/* The primitives for Windows types */
