diff options
author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2001-01-18 20:07:38 +0000 |
---|---|---|
committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2001-01-18 20:07:38 +0000 |
commit | b1960e5de4ecf7bff7aa20b936fb81958692fd7a (patch) | |
tree | a21755e522129a30298b67dc1e39a2e239cbf263 /mmap | |
parent | 7f950c89f939ced43f5cd086e3919acd7d6b5716 (diff) | |
download | libapr-b1960e5de4ecf7bff7aa20b936fb81958692fd7a.tar.gz |
Add remaining APR_DECLARE()s to all headers. Conditionally added
APR_DECLARES() to the sources, based on compilation emits (there
are many that should be changed eventually, but the compiler will
emit errors if those sources are added for win32).
This change also splits libapr from apr, so the two projects are
compiled seperately. Both .dsp files must be kept up-to-date with
source file revisions.
Finally, libapr.def is no longer needed - so it is gone.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61072 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'mmap')
-rw-r--r-- | mmap/unix/common.c | 3 | ||||
-rw-r--r-- | mmap/win32/mmap.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mmap/unix/common.c b/mmap/unix/common.c index f2a84438f..cec98e225 100644 --- a/mmap/unix/common.c +++ b/mmap/unix/common.c @@ -68,7 +68,8 @@ #if APR_HAS_MMAP || defined(BEOS) -apr_status_t apr_mmap_offset(void **addr, apr_mmap_t *mmap, apr_off_t offset) +APR_DECLARE(apr_status_t) apr_mmap_offset(void **addr, apr_mmap_t *mmap, + apr_off_t offset) { if (offset < 0 || offset > mmap->size) return APR_EINVAL; diff --git a/mmap/win32/mmap.c b/mmap/win32/mmap.c index 6e66e8800..28c522469 100644 --- a/mmap/win32/mmap.c +++ b/mmap/win32/mmap.c @@ -91,8 +91,9 @@ static apr_status_t mmap_cleanup(void *themmap) return APR_SUCCESS; } -apr_status_t apr_mmap_create(apr_mmap_t **new, apr_file_t *file, apr_off_t offset, - apr_size_t size, apr_int32_t flag, apr_pool_t *cont) +APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **new, apr_file_t *file, + apr_off_t offset, apr_size_t size, + apr_int32_t flag, apr_pool_t *cont) { static DWORD memblock = 0; DWORD fmaccess = 0, mvaccess = 0; @@ -151,7 +152,7 @@ apr_status_t apr_mmap_create(apr_mmap_t **new, apr_file_t *file, apr_off_t offse return APR_SUCCESS; } -apr_status_t apr_mmap_delete(apr_mmap_t *mmap) +APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mmap) { apr_status_t rv; |