diff options
| author | Ryan Bloom <rbb@apache.org> | 2000-06-22 00:36:07 +0000 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2000-06-22 00:36:07 +0000 |
| commit | 45afd7479e796350a2cbc44f4784920a1c8d54ea (patch) | |
| tree | 5322a9b5b971d414e76defda30ae5be49a73769d /lib | |
| parent | 92dc374b6d9b24a82380101b640119bcd6db48a0 (diff) | |
| download | apr-45afd7479e796350a2cbc44f4784920a1c8d54ea.tar.gz | |
Big commit. Basically, if APR defines a public feature macro, then APR
should also use that macro internally. This keeps us from checking for
multiple macros as we were doing in the SENDFILE case. It also means that
APR is definately building the same way that external programs expect it to.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@60239 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/apr_cpystrn.c | 11 | ||||
| -rw-r--r-- | lib/apr_pools.c | 9 | ||||
| -rw-r--r-- | lib/apr_signal.c | 2 | ||||
| -rw-r--r-- | lib/apr_snprintf.c | 3 |
4 files changed, 14 insertions, 11 deletions
diff --git a/lib/apr_cpystrn.c b/lib/apr_cpystrn.c index 444e005a2..17f270145 100644 --- a/lib/apr_cpystrn.c +++ b/lib/apr_cpystrn.c @@ -52,10 +52,11 @@ * <http://www.apache.org/>. */ +#include "apr.h" #include "apr_private.h" #include "apr_lib.h" -#if HAVE_SYS_TYPES_H +#if APR_HAVE_SYS_TYPES_H #include <sys/types.h> #endif #if HAVE_STRING_H @@ -243,7 +244,7 @@ APR_EXPORT(char *) ap_collapse_spaces(char *dest, const char *src) return (dest); } -#ifndef HAVE_STRDUP +#if !APR_HAVE_STRDUP char *strdup(const char *str) { char *sdup; @@ -259,7 +260,7 @@ char *strdup(const char *str) #endif /* The following two routines were donated for SVR4 by Andreas Vogel */ -#if !defined(HAVE_STRCASECMP) && !defined(HAVE_STRICMP) +#if (!APR_HAVE_STRCASECMP && !APR_HAVE_STRICMP) int strcasecmp(const char *a, const char *b) { const char *p = a; @@ -278,7 +279,7 @@ int strcasecmp(const char *a, const char *b) #endif -#if !defined(HAVE_STRNCASECMP) && !defined(HAVE_STRNICMP) +#if (!APR_HAVE_STRNCASECMP && !APR_HAVE_STRNICMP) int strncasecmp(const char *a, const char *b, size_t n) { const char *p = a; @@ -299,7 +300,7 @@ int strncasecmp(const char *a, const char *b, size_t n) #endif /* The following routine was donated for UTS21 by dwd@bell-labs.com */ -#ifndef HAVE_STRSTR +#if (!APR_HAVE_STRSTR) char *strstr(char *s1, char *s2) { char *p1, *p2; diff --git a/lib/apr_pools.c b/lib/apr_pools.c index 58ab329a5..89ebdf9da 100644 --- a/lib/apr_pools.c +++ b/lib/apr_pools.c @@ -59,6 +59,7 @@ * rst --- 4/95 --- 6/95 */ +#include "apr.h" #include "apr_private.h" #include "apr_portable.h" /* for get_os_proc */ @@ -74,19 +75,19 @@ #ifdef HAVE_SYS_SIGNAL_H #include <sys/signal.h> #endif -#ifdef HAVE_SIGNAL_H +#ifdef APR_HAVE_SIGNAL_H #include <signal.h> #endif -#ifdef HAVE_SYS_WAIT_H +#ifdef APR_HAVE_SYS_WAIT_H #include <sys/wait.h> #endif -#ifdef HAVE_SYS_TYPES_H +#ifdef APR_HAVE_SYS_TYPES_H #include <sys/types.h> #endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef HAVE_FCNTL_H +#ifdef APR_HAVE_FCNTL_H #include <fcntl.h> #endif diff --git a/lib/apr_signal.c b/lib/apr_signal.c index 9fd1164c8..340a88bf4 100644 --- a/lib/apr_signal.c +++ b/lib/apr_signal.c @@ -54,7 +54,7 @@ #include "apr_private.h" #include "apr_lib.h" -#ifdef HAVE_SIGNAL_H +#ifdef APR_HAVE_SIGNAL_H #include <signal.h> #endif diff --git a/lib/apr_snprintf.c b/lib/apr_snprintf.c index 5f9da4677..2fa0461ff 100644 --- a/lib/apr_snprintf.c +++ b/lib/apr_snprintf.c @@ -56,6 +56,7 @@ * Tsirigotis <panos@alumni.cs.colorado.edu> for xinetd. */ +#include "apr.h" #include "apr_private.h" #include "apr_lib.h" @@ -63,7 +64,7 @@ #ifdef HAVE_CTYPE_H #include <ctype.h> #endif -#if HAVE_NETINET_IN_H +#if APR_HAVE_NETINET_IN_H #include <netinet/in.h> #endif #ifdef HAVE_SYS_SOCKET_H |