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 /mmap/unix | |
| 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 'mmap/unix')
| -rw-r--r-- | mmap/unix/common.c | 2 | ||||
| -rw-r--r-- | mmap/unix/mmap.c | 2 | ||||
| -rw-r--r-- | mmap/unix/mmap_h.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/mmap/unix/common.c b/mmap/unix/common.c index b80653d80..4e1ccfd13 100644 --- a/mmap/unix/common.c +++ b/mmap/unix/common.c @@ -63,7 +63,7 @@ #include "mmap_h.h" -#if HAVE_MMAP || defined(BEOS) +#if APR_HAVE_MMAP || defined(BEOS) ap_status_t ap_mmap_offset(void **addr, ap_mmap_t *mmap, ap_off_t offset) { diff --git a/mmap/unix/mmap.c b/mmap/unix/mmap.c index a4800ddbb..90609ea62 100644 --- a/mmap/unix/mmap.c +++ b/mmap/unix/mmap.c @@ -55,7 +55,7 @@ #include "mmap_h.h" #include "apr_portable.h" -#if HAVE_MMAP || defined(BEOS) +#if APR_HAVE_MMAP || defined(BEOS) static ap_status_t mmap_cleanup(void *themmap) { diff --git a/mmap/unix/mmap_h.h b/mmap/unix/mmap_h.h index 7cb71b851..394ff1bfb 100644 --- a/mmap/unix/mmap_h.h +++ b/mmap/unix/mmap_h.h @@ -55,6 +55,7 @@ #ifndef MMAP_H_H #define MMAP_H_H +#include "apr.h" #include "apr_private.h" #include "apr_general.h" #include "apr_mmap.h" @@ -69,7 +70,7 @@ #if HAVE_STRING_H #include <string.h> #endif -#if HAVE_STDIO_H +#if APR_HAVE_STDIO_H #include <stdio.h> #endif #if HAVE_SYS_STAT_H |