diff options
author | William A. Rowe Jr <wrowe@apache.org> | 2000-10-16 06:04:50 +0000 |
---|---|---|
committer | William A. Rowe Jr <wrowe@apache.org> | 2000-10-16 06:04:50 +0000 |
commit | 81912b37409be0387e10346b84749ffdabcd4046 (patch) | |
tree | 24b8fe20a3b2235b303d428731c5d38a5b266ea7 | |
parent | a92d4bd076b126c4d64ebeee40692b4b2d56a128 (diff) | |
download | apr-81912b37409be0387e10346b84749ffdabcd4046.tar.gz |
Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols
for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper)
and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE.
All _VAR_ flavors changes to _DATA to be absolutely clear.
Thank you Greg, for the most obvious suggestion.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@60587 13f79535-47bb-0310-9956-ffa450edef68
33 files changed, 191 insertions, 206 deletions
@@ -179,7 +179,7 @@ The last line is not strictly needed. The parser in ScanDoc is not perfect yet, and it can not parse prototypes that are in any form other than return_type program_name(type1 param1, type2 param2, ...) This means that any function prototype that resembles: - APR_EXPORT(ap_status_t) ap_foo(int f1, char *f2) + APR_DECLARE(ap_status_t) ap_foo(int f1, char *f2) will need the deffunc. For an actual example, look at any file in the include directory (ap_tables.h diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c index 310e2df9a..4794232c7 100644 --- a/file_io/os2/readwrite.c +++ b/file_io/os2/readwrite.c @@ -325,7 +325,7 @@ apr_status_t apr_fgets(char *str, int len, apr_file_t *thefile) -APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...) +APR_DECLARE(int) apr_fprintf(apr_file_t *fptr, const char *format, ...) { int cc; va_list ap; diff --git a/file_io/unix/readwrite.c b/file_io/unix/readwrite.c index e5addd0e4..a9da3b071 100644 --- a/file_io/unix/readwrite.c +++ b/file_io/unix/readwrite.c @@ -376,7 +376,7 @@ apr_status_t apr_fgets(char *str, int len, apr_file_t *thefile) return rv; } -APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...) +APR_DECLARE(int) apr_fprintf(apr_file_t *fptr, const char *format, ...) { apr_status_t cc; va_list ap; diff --git a/file_io/win32/fileio.h b/file_io/win32/fileio.h index 178d57638..83bad40de 100644 --- a/file_io/win32/fileio.h +++ b/file_io/win32/fileio.h @@ -144,7 +144,7 @@ struct apr_dir_t { apr_status_t file_cleanup(void *); /*mode_t get_fileperms(apr_fileperms_t); */ -APR_EXPORT(char *) apr_os_systemcase_filename(struct apr_pool_t *pCont, +APR_DECLARE(char *) apr_os_systemcase_filename(struct apr_pool_t *pCont, const char *szFile); char * canonical_filename(struct apr_pool_t *pCont, const char *szFile); diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c index 72ac0bbf0..e07b4f2ba 100644 --- a/file_io/win32/readwrite.c +++ b/file_io/win32/readwrite.c @@ -388,7 +388,7 @@ static int printf_flush(apr_vformatter_buff_t *vbuff) return -1; } -APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...) +APR_DECLARE(int) apr_fprintf(apr_file_t *fptr, const char *format, ...) { int cc; va_list ap; diff --git a/helpers/MakeEtags b/helpers/MakeEtags index 25f6bdab1..1b030a3fc 100755 --- a/helpers/MakeEtags +++ b/helpers/MakeEtags @@ -27,7 +27,7 @@ etags=~/local/bin/etags # Exuberant etags is necessary since it can ignore some defined symbols # that obscure the function signatures. -ignore=API_EXPORT,API_EXPORT_NONSTD,__declspec +ignore=AP_DECLARE,AP_DECLARE_NONSTD,__declspec # Create an etags file at the root of the source # tree, then create symbol links to it from each diff --git a/include/apr.h.in b/include/apr.h.in index 495e165a7..d251c02cf 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -160,13 +160,6 @@ typedef @socklen_t_value@ apr_socklen_t; */ #define APR_DECLARE_DATA -/* These need to move into apr_compat.h when the symbol rename is complete - */ -#define APR_EXPORT(t) APR_DECLARE(t) -#define APR_EXPORT_NONSTD(t) APR_DECLARE_NONSTD(t) -#define APR_VAR_EXPORT APR_DECLARE_DATA -#define APR_VAR_IMPORT APR_DECLARE_DATA - /* Define APR_SSIZE_T_FMT. * If ssize_t is an integer we define it to be "d", * if ssize_t is a long int we define it to be "ld", diff --git a/include/apr.hw b/include/apr.hw index aca77acb8..9404b4d04 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -231,14 +231,6 @@ typedef int gid_t; #define APR_DECLARE_DATA __declspec(dllimport) #endif -/* These need to move into apr_compat.h when the symbol rename is complete - */ -#define APR_EXPORT(t) APR_DECLARE(t) -#define APR_EXPORT_NONSTD(t) APR_DECLARE_NONSTD(t) -#define APR_VAR_EXPORT APR_DECLARE_DATA -#define APR_VAR_IMPORT APR_DECLARE_DATA - - #define apr_signal(a,b) signal(a,b) typedef int apr_wait_t; diff --git a/include/apr_file_io.h b/include/apr_file_io.h index eb31de3a0..302557c4d 100644 --- a/include/apr_file_io.h +++ b/include/apr_file_io.h @@ -546,7 +546,7 @@ apr_status_t apr_dir_entry_ftype(apr_filetype_e *type, apr_dir_t *thedir); * @return The number of bytes written * @deffunc int apr_fprintf(apr_file_t *fptr, const char *format, ...) */ -APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...) +APR_DECLARE(int) apr_fprintf(apr_file_t *fptr, const char *format, ...) __attribute__((format(printf,2,3))); #ifdef __cplusplus diff --git a/include/apr_fnmatch.h b/include/apr_fnmatch.h index e15663337..0eb361463 100644 --- a/include/apr_fnmatch.h +++ b/include/apr_fnmatch.h @@ -69,7 +69,7 @@ extern "C" { * @deffunc apr_status_t apr_fnmatch(const char *pattern, const char *strings, int flags) */ -APR_EXPORT(apr_status_t) apr_fnmatch(const char *pattern, const char *strings, +APR_DECLARE(apr_status_t) apr_fnmatch(const char *pattern, const char *strings, int flags); /** @@ -78,7 +78,7 @@ APR_EXPORT(apr_status_t) apr_fnmatch(const char *pattern, const char *strings, * @return non-zero if pattern has any glob characters in it * @deffunc int apr_is_fnmatch(const char *pattern) */ -APR_EXPORT(int) apr_is_fnmatch(const char *pattern); +APR_DECLARE(int) apr_is_fnmatch(const char *pattern); #ifdef __cplusplus } diff --git a/include/apr_getopt.h b/include/apr_getopt.h index 57721f3a5..91be72c28 100644 --- a/include/apr_getopt.h +++ b/include/apr_getopt.h @@ -91,7 +91,7 @@ struct apr_getopt_t { * @tip Arguments 2 and 3 are most commonly argc and argv from main(argc, argv) * @deffunc apr_status_t apr_initopt(apr_getopt_t **os, apr_pool_t *cont,int argc, char *const *argv) */ -APR_EXPORT(apr_status_t) apr_initopt(apr_getopt_t **os, apr_pool_t *cont, +APR_DECLARE(apr_status_t) apr_initopt(apr_getopt_t **os, apr_pool_t *cont, int argc, char *const *argv); /** @@ -111,7 +111,7 @@ APR_EXPORT(apr_status_t) apr_initopt(apr_getopt_t **os, apr_pool_t *cont, * </PRE> * @deffunc apr_status_t apr_getopt(apr_getopt_t *os, const char *opts, char *optch, const char **optarg) */ -APR_EXPORT(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts, +APR_DECLARE(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts, char *optch, const char **optarg); #endif /* ! APR_GETOPT_H */ diff --git a/include/apr_hash.h b/include/apr_hash.h index 9cf66ff83..b1b7afeab 100644 --- a/include/apr_hash.h +++ b/include/apr_hash.h @@ -95,7 +95,7 @@ typedef struct apr_hash_index_t apr_hash_index_t; * @return The hash table just created * @deffunc apr_hash_t *apr_make_hash(apr_pool_t *pool) */ -APR_EXPORT(apr_hash_t *) apr_make_hash(apr_pool_t *pool); +APR_DECLARE(apr_hash_t *) apr_make_hash(apr_pool_t *pool); /** * Associate a value with a key in a hash table. @@ -106,7 +106,7 @@ APR_EXPORT(apr_hash_t *) apr_make_hash(apr_pool_t *pool); * @tip If the value is NULL the hash entry is deleted. * @deffunc void apr_hash_set(apr_hash_t *ht, const void *key, apr_size_t klen, const void *val) */ -APR_EXPORT(void) apr_hash_set(apr_hash_t *ht, const void *key, +APR_DECLARE(void) apr_hash_set(apr_hash_t *ht, const void *key, apr_ssize_t klen, const void *val); /** @@ -117,7 +117,7 @@ APR_EXPORT(void) apr_hash_set(apr_hash_t *ht, const void *key, * @return Returns NULL if the key is not present. * @deffunc void *apr_hash_get(apr_hash_t *ht, const void *key, apr_size_t klen) */ -APR_EXPORT(void*) apr_hash_get(apr_hash_t *ht, const void *key, +APR_DECLARE(void*) apr_hash_get(apr_hash_t *ht, const void *key, apr_ssize_t klen); /** @@ -146,7 +146,7 @@ APR_EXPORT(void*) apr_hash_get(apr_hash_t *ht, const void *key, * </PRE> * @deffunc apr_hash_index_t * apr_hash_first(apr_hash_t *ht) */ -APR_EXPORT(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht); +APR_DECLARE(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht); /** * Continue iterating over the entries in a hash table. @@ -154,7 +154,7 @@ APR_EXPORT(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht); * @return a pointer to the updated iteration state. NULL if there are no more * entries. * @deffunc apr_hash_index_t * apr_hash_next(apr_hash_index_t *hi) */ -APR_EXPORT(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi); +APR_DECLARE(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi); /** * Get the current entry's details from the iteration state. @@ -166,7 +166,7 @@ APR_EXPORT(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi); * corresponding data, or they may be NULL if the data isn't interesting. * @deffunc void apr_hash_this(apr_hash_index_t *hi, const void **key, apr_size_t *klen, void **val); */ -APR_EXPORT(void) apr_hash_this(apr_hash_index_t *hi, const void **key, +APR_DECLARE(void) apr_hash_this(apr_hash_index_t *hi, const void **key, apr_size_t *klen, void **val); #ifdef __cplusplus diff --git a/include/apr_lib.h b/include/apr_lib.h index 7b5f36214..550e35a0f 100644 --- a/include/apr_lib.h +++ b/include/apr_lib.h @@ -107,7 +107,7 @@ typedef struct apr_vformatter_buff_t { * </PRE> * @deffunc const char * apr_filename_of_pathname(const char *pathname) */ -APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname); +APR_DECLARE(const char *) apr_filename_of_pathname(const char *pathname); /* These macros allow correct support of 8-bit characters on systems which * support 8-bit characters. Pretty dumb how the cast is required, but @@ -202,7 +202,7 @@ APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname); * </PRE> * @deffunc int apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *b), apr_vformatter_buff_t *c, const char *fmt, va_list ap) */ -APR_EXPORT(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *b), +APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *b), apr_vformatter_buff_t *c, const char *fmt, va_list ap); @@ -212,7 +212,7 @@ APR_EXPORT(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *b), * @param hash The password to validate against * @deffunc apr_status_t apr_validate_password(const char *passwd, const char *hash) */ -APR_EXPORT(apr_status_t) apr_validate_password(const char *passwd, const char *hash); +APR_DECLARE(apr_status_t) apr_validate_password(const char *passwd, const char *hash); /* @@ -241,7 +241,7 @@ APR_EXPORT(apr_status_t) apr_validate_password(const char *passwd, const char *h * @param ... The arguments to use to fill out the format string. * @deffunc int apr_snprintf(char *buf, size_t len, const char *format, ...) */ -APR_EXPORT_NONSTD(int) apr_snprintf(char *buf, size_t len, +APR_DECLARE_NONSTD(int) apr_snprintf(char *buf, size_t len, const char *format, ...) __attribute__((format(printf,3,4))); @@ -254,7 +254,7 @@ APR_EXPORT_NONSTD(int) apr_snprintf(char *buf, size_t len, * @param ap The arguments to use to fill out the format string. * @deffunc int apr_vsnprintf(char *buf, size_t len, const char *format, va_list ap) */ -APR_EXPORT(int) apr_vsnprintf(char *buf, size_t len, const char *format, +APR_DECLARE(int) apr_vsnprintf(char *buf, size_t len, const char *format, va_list ap); /** @@ -264,7 +264,7 @@ APR_EXPORT(int) apr_vsnprintf(char *buf, size_t len, const char *format, * @param bufsize The length of the password string. * @deffunc apr_status_t apr_getpass(const char *prompt, char *pwbuf, size_t *bufsize) */ -APR_EXPORT(apr_status_t) apr_getpass(const char *prompt, char *pwbuf, size_t *bufsize); +APR_DECLARE(apr_status_t) apr_getpass(const char *prompt, char *pwbuf, size_t *bufsize); /** * Register a process to be killed when a pool dies. @@ -280,7 +280,7 @@ APR_EXPORT(apr_status_t) apr_getpass(const char *prompt, char *pwbuf, size_t *bu * </PRE> * @deffunc void apr_note_subprocess(struct apr_pool_t *a, apr_proc_t *pid, enum kill_conditions how) */ -APR_EXPORT(void) apr_note_subprocess(struct apr_pool_t *a, apr_proc_t *pid, +APR_DECLARE(void) apr_note_subprocess(struct apr_pool_t *a, apr_proc_t *pid, enum kill_conditions how); #ifdef __cplusplus diff --git a/include/apr_md5.h b/include/apr_md5.h index 54b48438d..41048cfce 100644 --- a/include/apr_md5.h +++ b/include/apr_md5.h @@ -121,7 +121,7 @@ struct apr_md5_ctx_t { * @param context The MD5 context to initialize. * @deffunc apr_status_t apr_MD5Init(apr_md5_ctx_t *context) */ -APR_EXPORT(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context); +APR_DECLARE(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context); /** * MD5 translation setup. Provides the APR translation handle to be used @@ -131,7 +131,7 @@ APR_EXPORT(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context); * @deffunc apr_status_t apr_MD5SetXlate(apr_md5_ctx_t *context, apr_xlate_t *xlate) */ #if APR_HAS_XLATE -APR_EXPORT(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, +APR_DECLARE(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, apr_xlate_t *xlate); #else #define apr_MD5SetXlate(context, xlate) APR_ENOTIMPL @@ -145,7 +145,7 @@ APR_EXPORT(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, * @param inputLen The length of the next message block * @deffunc apr_status_t apr_MD5Update(apr_md5_ctx_t *context, const unsigned char *input, unsigned int inputLen) */ -APR_EXPORT(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context, +APR_DECLARE(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context, const unsigned char *input, unsigned int inputLen); @@ -156,7 +156,7 @@ APR_EXPORT(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context, * @param context The MD5 content we are finalizing. * @deffunc apr_status_t apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE], apr_md5_ctx_t *context) */ -APR_EXPORT(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE], +APR_DECLARE(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE], apr_md5_ctx_t *context); /** @@ -167,7 +167,7 @@ APR_EXPORT(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE], * @param nbytes The length of the string * @deffunc apr_status_t apr_MD5Encode(const char *password, const char *salt, char *result, size_t nbytes) */ -APR_EXPORT(apr_status_t) apr_MD5Encode(const char *password, const char *salt, +APR_DECLARE(apr_status_t) apr_MD5Encode(const char *password, const char *salt, char *result, size_t nbytes); #ifdef __cplusplus diff --git a/include/apr_pools.h b/include/apr_pools.h index b368debcb..790f04580 100644 --- a/include/apr_pools.h +++ b/include/apr_pools.h @@ -162,9 +162,9 @@ struct process_chain { #endif #define apr_pool_join(a,b) #else -APR_EXPORT(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub); -APR_EXPORT(apr_pool_t *) apr_find_pool(const void *ts); -APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b); +APR_DECLARE(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub); +APR_DECLARE(apr_pool_t *) apr_find_pool(const void *ts); +APR_DECLARE(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b); #endif #ifdef ULTRIX_BRAIN_DEATH @@ -201,7 +201,7 @@ void apr_term_alloc(void); /* Tear down everything */ * error. * @deffunc apr_pool_t *apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode)) */ -APR_EXPORT(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode)); +APR_DECLARE(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode)); /** * clear all memory in the pool @@ -210,7 +210,7 @@ APR_EXPORT(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int r * to re-use this memory for the next allocation. * @deffunc void apr_clear_pool(apr_pool_t *p) */ -APR_EXPORT(void) apr_clear_pool(apr_pool_t *p); +APR_DECLARE(void) apr_clear_pool(apr_pool_t *p); /** * destroy the pool @@ -218,7 +218,7 @@ APR_EXPORT(void) apr_clear_pool(apr_pool_t *p); * @tip This will actually free the memory * @deffunc void apr_destroy_pool(apr_pool_t *p) */ -APR_EXPORT(void) apr_destroy_pool(apr_pool_t *p); +APR_DECLARE(void) apr_destroy_pool(apr_pool_t *p); /** * report the number of bytes currently in the pool @@ -226,14 +226,14 @@ APR_EXPORT(void) apr_destroy_pool(apr_pool_t *p); * @return The number of bytes * @deffunc apr_size_t apr_bytes_in_pool(apr_pool_t *p) */ -APR_EXPORT(apr_size_t) apr_bytes_in_pool(apr_pool_t *p); +APR_DECLARE(apr_size_t) apr_bytes_in_pool(apr_pool_t *p); /** * report the number of bytes currently in the list of free blocks * @return The number of bytes * @deffunc apr_size_t apr_bytes_in_free_blocks(void) */ -APR_EXPORT(apr_size_t) apr_bytes_in_free_blocks(void); +APR_DECLARE(apr_size_t) apr_bytes_in_free_blocks(void); /** * Determine if pool a is an ancestor of pool b @@ -243,7 +243,7 @@ APR_EXPORT(apr_size_t) apr_bytes_in_free_blocks(void); * of all pools. * @deffunc int apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b) */ -APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b); +APR_DECLARE(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b); /** * Allocate a block of memory from a pool @@ -252,7 +252,7 @@ APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b); * @return The allocated memory * @deffunc void *apr_palloc(apr_pool_t *c, apr_size_t reqsize) */ -APR_EXPORT(void *) apr_palloc(apr_pool_t *c, apr_size_t reqsize); +APR_DECLARE(void *) apr_palloc(apr_pool_t *c, apr_size_t reqsize); /** * Allocate a block of memory from a pool and set all of the memory to 0 @@ -261,7 +261,7 @@ APR_EXPORT(void *) apr_palloc(apr_pool_t *c, apr_size_t reqsize); * @return The allocated memory * @deffunc void *apr_pcalloc(apr_pool_t *p, apr_size_t size) */ -APR_EXPORT(void *) apr_pcalloc(apr_pool_t *p, apr_size_t size); +APR_DECLARE(void *) apr_pcalloc(apr_pool_t *p, apr_size_t size); /** * Register a function to be called when a pool is cleared or destroyed @@ -272,7 +272,7 @@ APR_EXPORT(void *) apr_pcalloc(apr_pool_t *p, apr_size_t size); * @param child_cleanup The function to call when a child process is created * @deffunc void apr_register_cleanup(apr_pool_t *p, const void *data, apr_status_t (*plain_cleanup) (void *), apr_status_t (*child_cleanup) (void *)) */ -APR_EXPORT(void) apr_register_cleanup(apr_pool_t *p, const void *data, +APR_DECLARE(void) apr_register_cleanup(apr_pool_t *p, const void *data, apr_status_t (*plain_cleanup) (void *), apr_status_t (*child_cleanup) (void *)); @@ -283,7 +283,7 @@ APR_EXPORT(void) apr_register_cleanup(apr_pool_t *p, const void *data, * @param cleanup The function to remove from cleanup * @deffunc void apr_kill_cleanup(apr_pool_t *p, const void *data, apr_status_t (*cleanup) (void *)) */ -APR_EXPORT(void) apr_kill_cleanup(apr_pool_t *p, const void *data, +APR_DECLARE(void) apr_kill_cleanup(apr_pool_t *p, const void *data, apr_status_t (*cleanup) (void *)); /** @@ -293,7 +293,7 @@ APR_EXPORT(void) apr_kill_cleanup(apr_pool_t *p, const void *data, * @param cleanup The function to remove from cleanup * @deffunc apr_status_t apr_run_cleanup(apr_pool_t *p, void *data, apr_status_t (*cleanup) (void *)) */ -APR_EXPORT(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data, +APR_DECLARE(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data, apr_status_t (*cleanup) (void *)); /* Preparing for exec() --- close files, etc., but *don't* flush I/O @@ -304,14 +304,14 @@ APR_EXPORT(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data, * closed because we are about to exec a new program * @deffunc void apr_cleanup_for_exec(void) */ -APR_EXPORT(void) apr_cleanup_for_exec(void); +APR_DECLARE(void) apr_cleanup_for_exec(void); /** * An empty cleanup function * @param data The data to cleanup * @deffunc apr_status_t apr_null_cleanup(void *data) */ -APR_EXPORT_NONSTD(apr_status_t) apr_null_cleanup(void *data); +APR_DECLARE_NONSTD(apr_status_t) apr_null_cleanup(void *data); /* used to guarantee to the apr_pool_t debugging code that the sub apr_pool_t will not be diff --git a/include/apr_strings.h b/include/apr_strings.h index fa16c4295..a84137eaf 100644 --- a/include/apr_strings.h +++ b/include/apr_strings.h @@ -118,7 +118,7 @@ int apr_strnatcasecmp(char const *a, char const *b); * @return The new string * @deffunc char *apr_pstrdup(apr_pool_t *p, const char *s) */ -APR_EXPORT(char *) apr_pstrdup(apr_pool_t *p, const char *s); +APR_DECLARE(char *) apr_pstrdup(apr_pool_t *p, const char *s); /** * duplicate the first n characters ofa string into memory allocated @@ -129,7 +129,7 @@ APR_EXPORT(char *) apr_pstrdup(apr_pool_t *p, const char *s); * @return The new string * @deffunc char *apr_pstrndup(apr_pool_t *p, const char *s, apr_size_t n) */ -APR_EXPORT(char *) apr_pstrndup(apr_pool_t *p, const char *s, apr_size_t n); +APR_DECLARE(char *) apr_pstrndup(apr_pool_t *p, const char *s, apr_size_t n); /** * Concatenate multiple strings, allocating memory out a pool @@ -138,7 +138,7 @@ APR_EXPORT(char *) apr_pstrndup(apr_pool_t *p, const char *s, apr_size_t n); * @return The new string * @deffunc char *apr_pstrcat(apr_pool_t *p, ...) */ -APR_EXPORT_NONSTD(char *) apr_pstrcat(apr_pool_t *p, ...); +APR_DECLARE_NONSTD(char *) apr_pstrcat(apr_pool_t *p, ...); /** * printf-style style printing routine. The data is output to a string @@ -149,7 +149,7 @@ APR_EXPORT_NONSTD(char *) apr_pstrcat(apr_pool_t *p, ...); * @return The new string * @deffunc char *apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap) */ -APR_EXPORT(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap); +APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap); /** * printf-style style printing routine. The data is output to a string @@ -160,7 +160,7 @@ APR_EXPORT(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap); * @return The new string * @deffunc char *apr_psprintf(apr_pool_t *p, const char *fmt, ...) */ -APR_EXPORT_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...); +APR_DECLARE_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...); /** * copy n characters from src to des> @@ -179,7 +179,7 @@ APR_EXPORT_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...); * </PRE> * @deffunc char *apr_cpystrn(char *dst, const char *src, size_t dst_size) */ -APR_EXPORT(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size); +APR_DECLARE(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size); /** * Strip spaces from a string @@ -188,7 +188,7 @@ APR_EXPORT(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size); * @param src The string to rid the spaces from. * @deffunc char *apr_collapse_spaces(char *dest, const char *src) */ -APR_EXPORT(char *) apr_collapse_spaces(char *dest, const char *src); +APR_DECLARE(char *) apr_collapse_spaces(char *dest, const char *src); /** * Convert the arguments to a program from one string to an array of @@ -198,7 +198,7 @@ APR_EXPORT(char *) apr_collapse_spaces(char *dest, const char *src); * @param token_context Pool to use. * @deffunc apr_status_t apr_tokenize_to_argv(const char *arg_str, char ***argv_out, apr_pool_t *token_context); */ -APR_EXPORT(apr_status_t) apr_tokenize_to_argv(const char *arg_str, +APR_DECLARE(apr_status_t) apr_tokenize_to_argv(const char *arg_str, char ***argv_out, apr_pool_t *token_context); diff --git a/include/apr_tables.h b/include/apr_tables.h index 4969ce7d8..09a9f2e4b 100644 --- a/include/apr_tables.h +++ b/include/apr_tables.h @@ -189,22 +189,22 @@ struct apr_btable_entry_t { || (((apr_array_header_t *)(t))->nelts == 0)) #define apr_is_empty_btable(t) apr_is_empty_table(t) -APR_EXPORT(apr_array_header_t *) apr_make_array(struct apr_pool_t *p, +APR_DECLARE(apr_array_header_t *) apr_make_array(struct apr_pool_t *p, int nelts, int elt_size); -APR_EXPORT(void *) apr_push_array(apr_array_header_t *arr); -APR_EXPORT(void) apr_array_cat(apr_array_header_t *dst, +APR_DECLARE(void *) apr_push_array(apr_array_header_t *arr); +APR_DECLARE(void) apr_array_cat(apr_array_header_t *dst, const apr_array_header_t *src); /* copy_array copies the *entire* array. copy_array_hdr just copies * the header, and arranges for the elements to be copied if (and only * if) the code subsequently does a push or arraycat. */ -APR_EXPORT(apr_array_header_t *) apr_copy_array(struct apr_pool_t *p, +APR_DECLARE(apr_array_header_t *) apr_copy_array(struct apr_pool_t *p, const apr_array_header_t *arr); -APR_EXPORT(apr_array_header_t *) +APR_DECLARE(apr_array_header_t *) apr_copy_array_hdr(struct apr_pool_t *p, const apr_array_header_t *arr); -APR_EXPORT(apr_array_header_t *) +APR_DECLARE(apr_array_header_t *) apr_append_arrays(struct apr_pool_t *p, const apr_array_header_t *first, const apr_array_header_t *second); @@ -215,52 +215,52 @@ APR_EXPORT(apr_array_header_t *) * or if there are no elements in the array. * If sep is non-NUL, it will be inserted between elements as a separator. */ -APR_EXPORT(char *) apr_array_pstrcat(struct apr_pool_t *p, +APR_DECLARE(char *) apr_array_pstrcat(struct apr_pool_t *p, const apr_array_header_t *arr, const char sep); -APR_EXPORT(apr_table_t *) apr_make_table(struct apr_pool_t *p, int nelts); -APR_EXPORT(apr_btable_t *) apr_make_btable(struct apr_pool_t *p, int nelts); -APR_EXPORT(apr_table_t *) apr_copy_table(struct apr_pool_t *p, +APR_DECLARE(apr_table_t *) apr_make_table(struct apr_pool_t *p, int nelts); +APR_DECLARE(apr_btable_t *) apr_make_btable(struct apr_pool_t *p, int nelts); +APR_DECLARE(apr_table_t *) apr_copy_table(struct apr_pool_t *p, const apr_table_t *t); -APR_EXPORT(apr_btable_t *) apr_copy_btable(struct apr_pool_t *p, +APR_DECLARE(apr_btable_t *) apr_copy_btable(struct apr_pool_t *p, const apr_btable_t *t); -APR_EXPORT(void) apr_clear_table(apr_table_t *t); -APR_EXPORT(void) apr_clear_btable(apr_btable_t *t); -APR_EXPORT(const char *) apr_table_get(const apr_table_t *t, const char *key); -APR_EXPORT(const apr_item_t *) apr_btable_get(const apr_btable_t *t, +APR_DECLARE(void) apr_clear_table(apr_table_t *t); +APR_DECLARE(void) apr_clear_btable(apr_btable_t *t); +APR_DECLARE(const char *) apr_table_get(const apr_table_t *t, const char *key); +APR_DECLARE(const apr_item_t *) apr_btable_get(const apr_btable_t *t, const char *key); -APR_EXPORT(void) apr_table_set(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_set(apr_table_t *t, const char *key, const char *val); -APR_EXPORT(void) apr_btable_set(apr_btable_t *t, const char *key, +APR_DECLARE(void) apr_btable_set(apr_btable_t *t, const char *key, size_t size, const void *val); -APR_EXPORT(void) apr_table_setn(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_setn(apr_table_t *t, const char *key, const char *val); -APR_EXPORT(void) apr_btable_setn(apr_btable_t *t, const char *key, +APR_DECLARE(void) apr_btable_setn(apr_btable_t *t, const char *key, size_t size, const void *val); -APR_EXPORT(void) apr_table_unset(apr_table_t *t, const char *key); -APR_EXPORT(void) apr_btable_unset(apr_btable_t *t, const char *key); -APR_EXPORT(void) apr_table_merge(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_unset(apr_table_t *t, const char *key); +APR_DECLARE(void) apr_btable_unset(apr_btable_t *t, const char *key); +APR_DECLARE(void) apr_table_merge(apr_table_t *t, const char *key, const char *val); -APR_EXPORT(void) apr_table_mergen(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_mergen(apr_table_t *t, const char *key, const char *val); -APR_EXPORT(void) apr_table_add(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_add(apr_table_t *t, const char *key, const char *val); -APR_EXPORT(void) apr_btable_add(apr_btable_t *t, const char *key, +APR_DECLARE(void) apr_btable_add(apr_btable_t *t, const char *key, size_t size, const void *val); -APR_EXPORT(void) apr_table_addn(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_addn(apr_table_t *t, const char *key, const char *val); -APR_EXPORT(void) apr_btable_addn(apr_btable_t *t, const char *key, +APR_DECLARE(void) apr_btable_addn(apr_btable_t *t, const char *key, size_t size, const void *val); -APR_EXPORT(apr_table_t *) apr_overlay_tables(struct apr_pool_t *p, +APR_DECLARE(apr_table_t *) apr_overlay_tables(struct apr_pool_t *p, const apr_table_t *overlay, const apr_table_t *base); -APR_EXPORT(apr_btable_t *) apr_overlay_btables(struct apr_pool_t *p, +APR_DECLARE(apr_btable_t *) apr_overlay_btables(struct apr_pool_t *p, const apr_btable_t *overlay, const apr_btable_t *base); -APR_EXPORT(void) +APR_DECLARE(void) apr_table_do(int (*comp) (void *, const char *, const char *), void *rec, const apr_table_t *t, ...); -APR_EXPORT(void) +APR_DECLARE(void) apr_table_vdo(int (*comp) (void *, const char *, const char *), void *rec, const apr_table_t *t, va_list); @@ -288,7 +288,7 @@ APR_EXPORT(void) */ #define APR_OVERLAP_TABLES_SET (0) #define APR_OVERLAP_TABLES_MERGE (1) -APR_EXPORT(void) apr_overlap_tables(apr_table_t *a, const apr_table_t *b, +APR_DECLARE(void) apr_overlap_tables(apr_table_t *a, const apr_table_t *b, unsigned flags); #ifdef __cplusplus diff --git a/include/arch/win32/fileio.h b/include/arch/win32/fileio.h index 178d57638..83bad40de 100644 --- a/include/arch/win32/fileio.h +++ b/include/arch/win32/fileio.h @@ -144,7 +144,7 @@ struct apr_dir_t { apr_status_t file_cleanup(void *); /*mode_t get_fileperms(apr_fileperms_t); */ -APR_EXPORT(char *) apr_os_systemcase_filename(struct apr_pool_t *pCont, +APR_DECLARE(char *) apr_os_systemcase_filename(struct apr_pool_t *pCont, const char *szFile); char * canonical_filename(struct apr_pool_t *pCont, const char *szFile); diff --git a/lib/apr_pools.c b/lib/apr_pools.c index f53ebd8df..c2d764763 100644 --- a/lib/apr_pools.c +++ b/lib/apr_pools.c @@ -456,7 +456,7 @@ static apr_pool_t *permanent_pool; #define POOL_HDR_CLICKS (1 + ((sizeof(struct apr_pool_t) - 1) / CLICK_SZ)) #define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ) -APR_EXPORT(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode)) +APR_DECLARE(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode)) { union block_hdr *blok; apr_pool_t *new_pool; @@ -537,7 +537,7 @@ struct cleanup { struct cleanup *next; }; -APR_EXPORT(void) apr_register_cleanup(apr_pool_t *p, const void *data, +APR_DECLARE(void) apr_register_cleanup(apr_pool_t *p, const void *data, apr_status_t (*plain_cleanup) (void *), apr_status_t (*child_cleanup) (void *)) { @@ -553,7 +553,7 @@ APR_EXPORT(void) apr_register_cleanup(apr_pool_t *p, const void *data, } } -APR_EXPORT(void) apr_kill_cleanup(apr_pool_t *p, const void *data, +APR_DECLARE(void) apr_kill_cleanup(apr_pool_t *p, const void *data, apr_status_t (*cleanup) (void *)) { struct cleanup *c; @@ -574,7 +574,7 @@ APR_EXPORT(void) apr_kill_cleanup(apr_pool_t *p, const void *data, } } -APR_EXPORT(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data, +APR_DECLARE(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data, apr_status_t (*cleanup) (void *)) { apr_kill_cleanup(p, data, cleanup); @@ -607,7 +607,7 @@ static void cleanup_pool_for_exec(apr_pool_t *p) } } -APR_EXPORT(void) apr_cleanup_for_exec(void) +APR_DECLARE(void) apr_cleanup_for_exec(void) { #if !defined(WIN32) && !defined(OS2) /* @@ -623,7 +623,7 @@ APR_EXPORT(void) apr_cleanup_for_exec(void) #endif /* ndef WIN32 */ } -APR_EXPORT_NONSTD(apr_status_t) apr_null_cleanup(void *data) +APR_DECLARE_NONSTD(apr_status_t) apr_null_cleanup(void *data) { /* do nothing cleanup routine */ return APR_SUCCESS; @@ -676,7 +676,7 @@ void apr_term_alloc(void) * This way, we are garaunteed that we only lock this mutex once when calling * either one of these functions. */ -APR_EXPORT(void) apr_clear_pool(apr_pool_t *a) +APR_DECLARE(void) apr_clear_pool(apr_pool_t *a) { while (a->sub_pools) { apr_destroy_pool(a->sub_pools); @@ -711,7 +711,7 @@ APR_EXPORT(void) apr_clear_pool(apr_pool_t *a) #endif } -APR_EXPORT(void) apr_destroy_pool(apr_pool_t *a) +APR_DECLARE(void) apr_destroy_pool(apr_pool_t *a) { apr_clear_pool(a); #if APR_HAS_THREADS @@ -735,11 +735,11 @@ APR_EXPORT(void) apr_destroy_pool(apr_pool_t *a) free_blocks(a->first); } -APR_EXPORT(apr_size_t) apr_bytes_in_pool(apr_pool_t *p) +APR_DECLARE(apr_size_t) apr_bytes_in_pool(apr_pool_t *p) { return bytes_in_block_list(p->first); } -APR_EXPORT(apr_size_t) apr_bytes_in_free_blocks(void) +APR_DECLARE(apr_size_t) apr_bytes_in_free_blocks(void) { return bytes_in_block_list(block_freelist); } @@ -762,7 +762,7 @@ extern char _end; /* Find the pool that ts belongs to, return NULL if it doesn't * belong to any pool. */ -APR_EXPORT(apr_pool_t *) apr_find_pool(const void *ts) +APR_DECLARE(apr_pool_t *) apr_find_pool(const void *ts) { const char *s = ts; union block_hdr **pb; @@ -808,7 +808,7 @@ APR_EXPORT(apr_pool_t *) apr_find_pool(const void *ts) /* return TRUE iff a is an ancestor of b * NULL is considered an ancestor of all pools */ -APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b) +APR_DECLARE(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b) { if (a == NULL) { return 1; @@ -830,7 +830,7 @@ APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b) * instead. This is a guarantee by the caller that sub will not * be destroyed before p is. */ -APR_EXPORT(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub) +APR_DECLARE(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub) { union block_hdr *b; @@ -857,7 +857,7 @@ APR_EXPORT(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub) * Allocating stuff... */ -APR_EXPORT(void*) apr_palloc(apr_pool_t *a, apr_size_t reqsize) +APR_DECLARE(void*) apr_palloc(apr_pool_t *a, apr_size_t reqsize) { #ifdef ALLOC_USE_MALLOC apr_size_t size = reqsize + CLICK_SZ; @@ -949,7 +949,7 @@ APR_EXPORT(void*) apr_palloc(apr_pool_t *a, apr_size_t reqsize) #endif } -APR_EXPORT(void *) apr_pcalloc(apr_pool_t *a, apr_size_t size) +APR_DECLARE(void *) apr_pcalloc(apr_pool_t *a, apr_size_t size) { void *res = apr_palloc(a, size); memset(res, '\0', size); @@ -1042,7 +1042,7 @@ static int psprintf_flush(apr_vformatter_buff_t *vbuff) #endif } -APR_EXPORT(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap) +APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap) { #ifdef ALLOC_USE_MALLOC struct psprintf_data ps; @@ -1101,7 +1101,7 @@ APR_EXPORT(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap) #endif } -APR_EXPORT_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...) +APR_DECLARE_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...) { va_list ap; char *res; @@ -1124,7 +1124,7 @@ APR_EXPORT_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...) * generic interface, but for now, it's a special case */ -APR_EXPORT(void) apr_note_subprocess(apr_pool_t *a, apr_proc_t *pid, +APR_DECLARE(void) apr_note_subprocess(apr_pool_t *a, apr_proc_t *pid, enum kill_conditions how) { struct process_chain *new = diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index f53ebd8df..c2d764763 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -456,7 +456,7 @@ static apr_pool_t *permanent_pool; #define POOL_HDR_CLICKS (1 + ((sizeof(struct apr_pool_t) - 1) / CLICK_SZ)) #define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ) -APR_EXPORT(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode)) +APR_DECLARE(apr_pool_t *) apr_make_sub_pool(apr_pool_t *p, int (*apr_abort)(int retcode)) { union block_hdr *blok; apr_pool_t *new_pool; @@ -537,7 +537,7 @@ struct cleanup { struct cleanup *next; }; -APR_EXPORT(void) apr_register_cleanup(apr_pool_t *p, const void *data, +APR_DECLARE(void) apr_register_cleanup(apr_pool_t *p, const void *data, apr_status_t (*plain_cleanup) (void *), apr_status_t (*child_cleanup) (void *)) { @@ -553,7 +553,7 @@ APR_EXPORT(void) apr_register_cleanup(apr_pool_t *p, const void *data, } } -APR_EXPORT(void) apr_kill_cleanup(apr_pool_t *p, const void *data, +APR_DECLARE(void) apr_kill_cleanup(apr_pool_t *p, const void *data, apr_status_t (*cleanup) (void *)) { struct cleanup *c; @@ -574,7 +574,7 @@ APR_EXPORT(void) apr_kill_cleanup(apr_pool_t *p, const void *data, } } -APR_EXPORT(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data, +APR_DECLARE(apr_status_t) apr_run_cleanup(apr_pool_t *p, void *data, apr_status_t (*cleanup) (void *)) { apr_kill_cleanup(p, data, cleanup); @@ -607,7 +607,7 @@ static void cleanup_pool_for_exec(apr_pool_t *p) } } -APR_EXPORT(void) apr_cleanup_for_exec(void) +APR_DECLARE(void) apr_cleanup_for_exec(void) { #if !defined(WIN32) && !defined(OS2) /* @@ -623,7 +623,7 @@ APR_EXPORT(void) apr_cleanup_for_exec(void) #endif /* ndef WIN32 */ } -APR_EXPORT_NONSTD(apr_status_t) apr_null_cleanup(void *data) +APR_DECLARE_NONSTD(apr_status_t) apr_null_cleanup(void *data) { /* do nothing cleanup routine */ return APR_SUCCESS; @@ -676,7 +676,7 @@ void apr_term_alloc(void) * This way, we are garaunteed that we only lock this mutex once when calling * either one of these functions. */ -APR_EXPORT(void) apr_clear_pool(apr_pool_t *a) +APR_DECLARE(void) apr_clear_pool(apr_pool_t *a) { while (a->sub_pools) { apr_destroy_pool(a->sub_pools); @@ -711,7 +711,7 @@ APR_EXPORT(void) apr_clear_pool(apr_pool_t *a) #endif } -APR_EXPORT(void) apr_destroy_pool(apr_pool_t *a) +APR_DECLARE(void) apr_destroy_pool(apr_pool_t *a) { apr_clear_pool(a); #if APR_HAS_THREADS @@ -735,11 +735,11 @@ APR_EXPORT(void) apr_destroy_pool(apr_pool_t *a) free_blocks(a->first); } -APR_EXPORT(apr_size_t) apr_bytes_in_pool(apr_pool_t *p) +APR_DECLARE(apr_size_t) apr_bytes_in_pool(apr_pool_t *p) { return bytes_in_block_list(p->first); } -APR_EXPORT(apr_size_t) apr_bytes_in_free_blocks(void) +APR_DECLARE(apr_size_t) apr_bytes_in_free_blocks(void) { return bytes_in_block_list(block_freelist); } @@ -762,7 +762,7 @@ extern char _end; /* Find the pool that ts belongs to, return NULL if it doesn't * belong to any pool. */ -APR_EXPORT(apr_pool_t *) apr_find_pool(const void *ts) +APR_DECLARE(apr_pool_t *) apr_find_pool(const void *ts) { const char *s = ts; union block_hdr **pb; @@ -808,7 +808,7 @@ APR_EXPORT(apr_pool_t *) apr_find_pool(const void *ts) /* return TRUE iff a is an ancestor of b * NULL is considered an ancestor of all pools */ -APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b) +APR_DECLARE(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b) { if (a == NULL) { return 1; @@ -830,7 +830,7 @@ APR_EXPORT(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b) * instead. This is a guarantee by the caller that sub will not * be destroyed before p is. */ -APR_EXPORT(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub) +APR_DECLARE(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub) { union block_hdr *b; @@ -857,7 +857,7 @@ APR_EXPORT(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub) * Allocating stuff... */ -APR_EXPORT(void*) apr_palloc(apr_pool_t *a, apr_size_t reqsize) +APR_DECLARE(void*) apr_palloc(apr_pool_t *a, apr_size_t reqsize) { #ifdef ALLOC_USE_MALLOC apr_size_t size = reqsize + CLICK_SZ; @@ -949,7 +949,7 @@ APR_EXPORT(void*) apr_palloc(apr_pool_t *a, apr_size_t reqsize) #endif } -APR_EXPORT(void *) apr_pcalloc(apr_pool_t *a, apr_size_t size) +APR_DECLARE(void *) apr_pcalloc(apr_pool_t *a, apr_size_t size) { void *res = apr_palloc(a, size); memset(res, '\0', size); @@ -1042,7 +1042,7 @@ static int psprintf_flush(apr_vformatter_buff_t *vbuff) #endif } -APR_EXPORT(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap) +APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap) { #ifdef ALLOC_USE_MALLOC struct psprintf_data ps; @@ -1101,7 +1101,7 @@ APR_EXPORT(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap) #endif } -APR_EXPORT_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...) +APR_DECLARE_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...) { va_list ap; char *res; @@ -1124,7 +1124,7 @@ APR_EXPORT_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...) * generic interface, but for now, it's a special case */ -APR_EXPORT(void) apr_note_subprocess(apr_pool_t *a, apr_proc_t *pid, +APR_DECLARE(void) apr_note_subprocess(apr_pool_t *a, apr_proc_t *pid, enum kill_conditions how) { struct process_chain *new = diff --git a/misc/unix/getopt.c b/misc/unix/getopt.c index 03c64ccd5..f3a561f6c 100644 --- a/misc/unix/getopt.c +++ b/misc/unix/getopt.c @@ -35,7 +35,7 @@ #define EMSG "" -APR_EXPORT(apr_status_t) apr_initopt(apr_getopt_t **os, apr_pool_t *cont, +APR_DECLARE(apr_status_t) apr_initopt(apr_getopt_t **os, apr_pool_t *cont, int argc, char *const *argv) { *os = apr_palloc(cont, sizeof(apr_getopt_t)); @@ -48,7 +48,7 @@ APR_EXPORT(apr_status_t) apr_initopt(apr_getopt_t **os, apr_pool_t *cont, return APR_SUCCESS; } -APR_EXPORT(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts, +APR_DECLARE(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts, char *optch, const char **optarg) { const char *p; diff --git a/misc/unix/otherchild.c b/misc/unix/otherchild.c index 61312da70..fb77b36b1 100644 --- a/misc/unix/otherchild.c +++ b/misc/unix/otherchild.c @@ -71,7 +71,7 @@ static apr_other_child_rec_t *other_children = NULL; -APR_EXPORT(void) apr_register_other_child(apr_proc_t *pid, +APR_DECLARE(void) apr_register_other_child(apr_proc_t *pid, void (*maintenance) (int reason, void *, int status), void *data, apr_file_t *write_fd, apr_pool_t *p) { @@ -91,7 +91,7 @@ APR_EXPORT(void) apr_register_other_child(apr_proc_t *pid, other_children = ocr; } -APR_EXPORT(void) apr_unregister_other_child(void *data) +APR_DECLARE(void) apr_unregister_other_child(void *data) { apr_other_child_rec_t **pocr, *nocr; @@ -156,7 +156,7 @@ void apr_probe_writable_fds(void) } } -APR_EXPORT(apr_status_t) apr_reap_other_child(apr_proc_t *pid, int status) +APR_DECLARE(apr_status_t) apr_reap_other_child(apr_proc_t *pid, int status) { apr_other_child_rec_t *ocr, *nocr; @@ -172,7 +172,7 @@ APR_EXPORT(apr_status_t) apr_reap_other_child(apr_proc_t *pid, int status) return APR_CHILD_NOTDONE; } -APR_EXPORT(void) apr_check_other_child(void) +APR_DECLARE(void) apr_check_other_child(void) { apr_other_child_rec_t *ocr, *nocr; pid_t waitret; diff --git a/misc/win32/names.c b/misc/win32/names.c index baa20236a..9e3fc7134 100644 --- a/misc/win32/names.c +++ b/misc/win32/names.c @@ -82,7 +82,7 @@ static BOOL OnlyDots(char *pString) * is present on the existing path. This routine also * converts alias names to long names. */ -APR_EXPORT(char *) apr_os_systemcase_filename(apr_pool_t *pCont, +APR_DECLARE(char *) apr_os_systemcase_filename(apr_pool_t *pCont, const char *szFile) { char buf[HUGE_STRING_LEN]; diff --git a/passwd/apr_getpass.c b/passwd/apr_getpass.c index e714aa779..9231cca94 100644 --- a/passwd/apr_getpass.c +++ b/passwd/apr_getpass.c @@ -204,7 +204,7 @@ static char *getpass(const char *prompt) * but the caller is *not* made aware of it. */ -APR_EXPORT(apr_status_t) apr_getpass(const char *prompt, char *pwbuf, size_t *bufsiz) +APR_DECLARE(apr_status_t) apr_getpass(const char *prompt, char *pwbuf, size_t *bufsiz) { char *pw_got = NULL; int result = 0; diff --git a/passwd/apr_md5.c b/passwd/apr_md5.c index 838b633a2..30ca92183 100644 --- a/passwd/apr_md5.c +++ b/passwd/apr_md5.c @@ -186,7 +186,7 @@ static apr_xlate_t *xlate_ebcdic_to_ascii; /* used in apr_MD5Encode() */ /* MD5 initialization. Begins an MD5 operation, writing a new context. */ -APR_EXPORT(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context) +APR_DECLARE(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context) { context->count[0] = context->count[1] = 0; /* Load magic initialization constants. */ @@ -205,7 +205,7 @@ APR_EXPORT(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context) * to be used for translating the content before calculating the * digest. */ -APR_EXPORT(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, +APR_DECLARE(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, apr_xlate_t *xlate) { apr_status_t rv; @@ -229,7 +229,7 @@ APR_EXPORT(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, operation, processing another message block, and updating the context. */ -APR_EXPORT(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context, +APR_DECLARE(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context, const unsigned char *input, unsigned int inputLen) { @@ -311,7 +311,7 @@ APR_EXPORT(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context, /* MD5 finalization. Ends an MD5 message-digest operation, writing the the message digest and zeroizing the context. */ -APR_EXPORT(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE], +APR_DECLARE(apr_status_t) apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE], apr_md5_ctx_t *context) { unsigned char bits[8]; @@ -461,7 +461,7 @@ static void Decode(UINT4 *output, const unsigned char *input, unsigned int len) } #ifdef CHARSET_EBCDIC -APR_EXPORT(apr_status_t) apr_MD5InitEBCDIC(apr_xlate_t *xlate) +APR_DECLARE(apr_status_t) apr_MD5InitEBCDIC(apr_xlate_t *xlate) { xlate_ebcdic_to_ascii = xlate; return APR_SUCCESS; @@ -491,7 +491,7 @@ static void to64(char *s, unsigned long v, int n) } } -APR_EXPORT(apr_status_t) apr_MD5Encode(const char *pw, const char *salt, +APR_DECLARE(apr_status_t) apr_MD5Encode(const char *pw, const char *salt, char *result, size_t nbytes) { /* @@ -652,7 +652,7 @@ APR_EXPORT(apr_status_t) apr_MD5Encode(const char *pw, const char *salt, * APR_EMISMATCH if they don't. */ -APR_EXPORT(apr_status_t) apr_validate_password(const char *passwd, +APR_DECLARE(apr_status_t) apr_validate_password(const char *passwd, const char *hash) { char sample[120]; diff --git a/strings/apr_cpystrn.c b/strings/apr_cpystrn.c index 53433c656..5f01ea2e9 100644 --- a/strings/apr_cpystrn.c +++ b/strings/apr_cpystrn.c @@ -80,7 +80,7 @@ * apr_cpystrn() follows the same call structure as strncpy(). */ -APR_EXPORT(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size) +APR_DECLARE(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size) { char *d, *end; @@ -120,7 +120,7 @@ APR_EXPORT(char *) apr_cpystrn(char *dst, const char *src, size_t dst_size) * pool and filled in with copies of the tokens * found during parsing of the arg_str. */ -APR_EXPORT(apr_status_t) apr_tokenize_to_argv(const char *arg_str, +APR_DECLARE(apr_status_t) apr_tokenize_to_argv(const char *arg_str, char ***argv_out, apr_pool_t *token_context) { @@ -212,7 +212,7 @@ APR_EXPORT(apr_status_t) apr_tokenize_to_argv(const char *arg_str, * Corrected Win32 to accept "a/b\\stuff", "a:stuff" */ -APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname) +APR_DECLARE(const char *) apr_filename_of_pathname(const char *pathname) { const char path_separator = '/'; const char *s = strrchr(pathname, path_separator); @@ -234,7 +234,7 @@ APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname) * collapse in place (src == dest) is legal. * returns terminating null ptr to dest string. */ -APR_EXPORT(char *) apr_collapse_spaces(char *dest, const char *src) +APR_DECLARE(char *) apr_collapse_spaces(char *dest, const char *src) { while (*src) { if (!apr_isspace(*src)) diff --git a/strings/apr_fnmatch.c b/strings/apr_fnmatch.c index 131379eca..63e8e9dce 100644 --- a/strings/apr_fnmatch.c +++ b/strings/apr_fnmatch.c @@ -56,7 +56,7 @@ static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; static const char *rangematch(const char *, int, int); -APR_EXPORT(apr_status_t) apr_fnmatch(const char *pattern, const char *string, int flags) +APR_DECLARE(apr_status_t) apr_fnmatch(const char *pattern, const char *string, int flags) { const char *stringstart; char c, test; @@ -210,7 +210,7 @@ static const char *rangematch(const char *pattern, int test, int flags) /* This function is an Apache addition */ /* return non-zero if pattern has any glob chars in it */ -APR_EXPORT(int) apr_is_fnmatch(const char *pattern) +APR_DECLARE(int) apr_is_fnmatch(const char *pattern) { int nesting; diff --git a/strings/apr_snprintf.c b/strings/apr_snprintf.c index 30648e7da..8b577dad3 100644 --- a/strings/apr_snprintf.c +++ b/strings/apr_snprintf.c @@ -653,7 +653,7 @@ static char *conv_p2_quad(u_widest_int num, register int nbits, /* * Do format conversion placing the output in buffer */ -APR_EXPORT(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *), +APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *), apr_vformatter_buff_t *vbuff, const char *fmt, va_list ap) { register char *sp; @@ -1155,7 +1155,7 @@ static int snprintf_flush(apr_vformatter_buff_t *vbuff) } -APR_EXPORT_NONSTD(int) apr_snprintf(char *buf, size_t len, +APR_DECLARE_NONSTD(int) apr_snprintf(char *buf, size_t len, const char *format, ...) { int cc; @@ -1176,7 +1176,7 @@ APR_EXPORT_NONSTD(int) apr_snprintf(char *buf, size_t len, } -APR_EXPORT(int) apr_vsnprintf(char *buf, size_t len, const char *format, +APR_DECLARE(int) apr_vsnprintf(char *buf, size_t len, const char *format, va_list ap) { int cc; diff --git a/strings/apr_strings.c b/strings/apr_strings.c index f072f260d..200f18b64 100644 --- a/strings/apr_strings.c +++ b/strings/apr_strings.c @@ -57,7 +57,7 @@ #include "apr_private.h" #include "apr_lib.h" -APR_EXPORT(char *) apr_pstrdup(apr_pool_t *a, const char *s) +APR_DECLARE(char *) apr_pstrdup(apr_pool_t *a, const char *s) { char *res; size_t len; @@ -71,7 +71,7 @@ APR_EXPORT(char *) apr_pstrdup(apr_pool_t *a, const char *s) return res; } -APR_EXPORT(char *) apr_pstrndup(apr_pool_t *a, const char *s, apr_size_t n) +APR_DECLARE(char *) apr_pstrndup(apr_pool_t *a, const char *s, apr_size_t n) { char *res; @@ -84,7 +84,7 @@ APR_EXPORT(char *) apr_pstrndup(apr_pool_t *a, const char *s, apr_size_t n) return res; } -APR_EXPORT_NONSTD(char *) apr_pstrcat(apr_pool_t *a, ...) +APR_DECLARE_NONSTD(char *) apr_pstrcat(apr_pool_t *a, ...) { char *cp, *argp, *res; diff --git a/tables/apr_hash.c b/tables/apr_hash.c index 6ec6db055..f6b6fad31 100644 --- a/tables/apr_hash.c +++ b/tables/apr_hash.c @@ -127,7 +127,7 @@ static apr_hash_entry_t **alloc_array(apr_hash_t *ht) return apr_pcalloc(ht->pool, sizeof(*ht->array) * (ht->max + 1)); } -APR_EXPORT(apr_hash_t *) apr_make_hash(apr_pool_t *pool) +APR_DECLARE(apr_hash_t *) apr_make_hash(apr_pool_t *pool) { apr_hash_t *ht; ht = apr_palloc(pool, sizeof(apr_hash_t)); @@ -143,7 +143,7 @@ APR_EXPORT(apr_hash_t *) apr_make_hash(apr_pool_t *pool) * Hash iteration functions. */ -APR_EXPORT(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi) +APR_DECLARE(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi) { hi->this = hi->next; while (!hi->this) { @@ -155,7 +155,7 @@ APR_EXPORT(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi) return hi; } -APR_EXPORT(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht) +APR_DECLARE(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht) { apr_hash_index_t *hi; hi = apr_palloc(ht->pool, sizeof(*hi)); @@ -166,7 +166,7 @@ APR_EXPORT(apr_hash_index_t *) apr_hash_first(apr_hash_t *ht) return apr_hash_next(hi); } -APR_EXPORT(void) apr_hash_this(apr_hash_index_t *hi, +APR_DECLARE(void) apr_hash_this(apr_hash_index_t *hi, const void **key, apr_size_t *klen, void **val) @@ -280,7 +280,7 @@ static apr_hash_entry_t **find_entry(apr_hash_t *ht, return hep; } -APR_EXPORT(void *) apr_hash_get(apr_hash_t *ht, +APR_DECLARE(void *) apr_hash_get(apr_hash_t *ht, const void *key, apr_ssize_t klen) { @@ -292,7 +292,7 @@ APR_EXPORT(void *) apr_hash_get(apr_hash_t *ht, return NULL; } -APR_EXPORT(void) apr_hash_set(apr_hash_t *ht, +APR_DECLARE(void) apr_hash_set(apr_hash_t *ht, const void *key, apr_ssize_t klen, const void *val) diff --git a/tables/apr_tables.c b/tables/apr_tables.c index a5dbdd6f4..abfd4b395 100644 --- a/tables/apr_tables.c +++ b/tables/apr_tables.c @@ -108,7 +108,7 @@ static void make_array_core(apr_array_header_t *res, apr_pool_t *c, res->nalloc = nelts; /* ...but this many allocated */ } -APR_EXPORT(apr_array_header_t *) apr_make_array(apr_pool_t *p, +APR_DECLARE(apr_array_header_t *) apr_make_array(apr_pool_t *p, int nelts, int elt_size) { apr_array_header_t *res; @@ -118,7 +118,7 @@ APR_EXPORT(apr_array_header_t *) apr_make_array(apr_pool_t *p, return res; } -APR_EXPORT(void *) apr_push_array(apr_array_header_t *arr) +APR_DECLARE(void *) apr_push_array(apr_array_header_t *arr) { if (arr->nelts == arr->nalloc) { int new_size = (arr->nalloc <= 0) ? 1 : arr->nalloc * 2; @@ -135,7 +135,7 @@ APR_EXPORT(void *) apr_push_array(apr_array_header_t *arr) return arr->elts + (arr->elt_size * (arr->nelts - 1)); } -APR_EXPORT(void) apr_array_cat(apr_array_header_t *dst, +APR_DECLARE(void) apr_array_cat(apr_array_header_t *dst, const apr_array_header_t *src) { int elt_size = dst->elt_size; @@ -160,7 +160,7 @@ APR_EXPORT(void) apr_array_cat(apr_array_header_t *dst, dst->nelts += src->nelts; } -APR_EXPORT(apr_array_header_t *) apr_copy_array(apr_pool_t *p, +APR_DECLARE(apr_array_header_t *) apr_copy_array(apr_pool_t *p, const apr_array_header_t *arr) { apr_array_header_t *res = apr_make_array(p, arr->nalloc, arr->elt_size); @@ -186,7 +186,7 @@ static APR_INLINE void copy_array_hdr_core(apr_array_header_t *res, res->nalloc = arr->nelts; /* Force overflow on push */ } -APR_EXPORT(apr_array_header_t *) +APR_DECLARE(apr_array_header_t *) apr_copy_array_hdr(apr_pool_t *p, const apr_array_header_t *arr) { @@ -200,7 +200,7 @@ APR_EXPORT(apr_array_header_t *) /* The above is used here to avoid consing multiple new array bodies... */ -APR_EXPORT(apr_array_header_t *) +APR_DECLARE(apr_array_header_t *) apr_append_arrays(apr_pool_t *p, const apr_array_header_t *first, const apr_array_header_t *second) @@ -217,7 +217,7 @@ APR_EXPORT(apr_array_header_t *) * or if there are no elements in the array. * If sep is non-NUL, it will be inserted between elements as a separator. */ -APR_EXPORT(char *) apr_array_pstrcat(apr_pool_t *p, +APR_DECLARE(char *) apr_array_pstrcat(apr_pool_t *p, const apr_array_header_t *arr, const char sep) { @@ -294,7 +294,7 @@ static apr_table_entry_t *table_push(apr_table_t *t) #endif /* MAKE_TABLE_PROFILE */ -APR_EXPORT(apr_table_t *) apr_make_table(apr_pool_t *p, int nelts) +APR_DECLARE(apr_table_t *) apr_make_table(apr_pool_t *p, int nelts) { apr_table_t *t = apr_palloc(p, sizeof(apr_table_t)); @@ -305,7 +305,7 @@ APR_EXPORT(apr_table_t *) apr_make_table(apr_pool_t *p, int nelts) return t; } -APR_EXPORT(apr_btable_t *) apr_make_btable(apr_pool_t *p, int nelts) +APR_DECLARE(apr_btable_t *) apr_make_btable(apr_pool_t *p, int nelts) { apr_btable_t *t = apr_palloc(p, sizeof(apr_btable_t)); @@ -316,7 +316,7 @@ APR_EXPORT(apr_btable_t *) apr_make_btable(apr_pool_t *p, int nelts) return t; } -APR_EXPORT(apr_table_t *) apr_copy_table(apr_pool_t *p, const apr_table_t *t) +APR_DECLARE(apr_table_t *) apr_copy_table(apr_pool_t *p, const apr_table_t *t) { apr_table_t *new = apr_palloc(p, sizeof(apr_table_t)); @@ -335,7 +335,7 @@ APR_EXPORT(apr_table_t *) apr_copy_table(apr_pool_t *p, const apr_table_t *t) return new; } -APR_EXPORT(apr_btable_t *) apr_copy_btable(apr_pool_t *p, +APR_DECLARE(apr_btable_t *) apr_copy_btable(apr_pool_t *p, const apr_btable_t *t) { apr_btable_t *new = apr_palloc(p, sizeof(apr_btable_entry_t)); @@ -355,17 +355,17 @@ APR_EXPORT(apr_btable_t *) apr_copy_btable(apr_pool_t *p, return new; } -APR_EXPORT(void) apr_clear_table(apr_table_t *t) +APR_DECLARE(void) apr_clear_table(apr_table_t *t) { t->a.nelts = 0; } -APR_EXPORT(void) apr_clear_btable(apr_btable_t *t) +APR_DECLARE(void) apr_clear_btable(apr_btable_t *t) { t->a.nelts = 0; } -APR_EXPORT(const char *) apr_table_get(const apr_table_t *t, const char *key) +APR_DECLARE(const char *) apr_table_get(const apr_table_t *t, const char *key) { apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts; int i; @@ -383,7 +383,7 @@ APR_EXPORT(const char *) apr_table_get(const apr_table_t *t, const char *key) return NULL; } -APR_EXPORT(const apr_item_t *) apr_btable_get(const apr_btable_t *t, +APR_DECLARE(const apr_item_t *) apr_btable_get(const apr_btable_t *t, const char *key) { apr_btable_entry_t *elts = (apr_btable_entry_t *) t->a.elts; @@ -402,7 +402,7 @@ APR_EXPORT(const apr_item_t *) apr_btable_get(const apr_btable_t *t, return NULL; } -APR_EXPORT(void) apr_table_set(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_set(apr_table_t *t, const char *key, const char *val) { register int i, j, k; @@ -436,7 +436,7 @@ APR_EXPORT(void) apr_table_set(apr_table_t *t, const char *key, } } -APR_EXPORT(void) apr_btable_set(apr_btable_t *t, const char *key, +APR_DECLARE(void) apr_btable_set(apr_btable_t *t, const char *key, size_t size, const void *val) { register int i, j, k; @@ -476,7 +476,7 @@ APR_EXPORT(void) apr_btable_set(apr_btable_t *t, const char *key, } } -APR_EXPORT(void) apr_table_setn(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_setn(apr_table_t *t, const char *key, const char *val) { register int i, j, k; @@ -523,7 +523,7 @@ APR_EXPORT(void) apr_table_setn(apr_table_t *t, const char *key, } } -APR_EXPORT(void) apr_btable_setn(apr_btable_t *t, const char *key, +APR_DECLARE(void) apr_btable_setn(apr_btable_t *t, const char *key, size_t size, const void *val) { register int i, j, k; @@ -575,7 +575,7 @@ APR_EXPORT(void) apr_btable_setn(apr_btable_t *t, const char *key, } } -APR_EXPORT(void) apr_table_unset(apr_table_t *t, const char *key) +APR_DECLARE(void) apr_table_unset(apr_table_t *t, const char *key) { register int i, j, k; apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts; @@ -600,7 +600,7 @@ APR_EXPORT(void) apr_table_unset(apr_table_t *t, const char *key) } } -APR_EXPORT(void) apr_btable_unset(apr_btable_t *t, const char *key) +APR_DECLARE(void) apr_btable_unset(apr_btable_t *t, const char *key) { register int i, j, k; apr_btable_entry_t *elts = (apr_btable_entry_t *) t->a.elts; @@ -625,7 +625,7 @@ APR_EXPORT(void) apr_btable_unset(apr_btable_t *t, const char *key) } } -APR_EXPORT(void) apr_table_merge(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_merge(apr_table_t *t, const char *key, const char *val) { apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts; @@ -643,7 +643,7 @@ APR_EXPORT(void) apr_table_merge(apr_table_t *t, const char *key, elts->val = apr_pstrdup(t->a.cont, val); } -APR_EXPORT(void) apr_table_mergen(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_mergen(apr_table_t *t, const char *key, const char *val) { apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts; @@ -674,7 +674,7 @@ APR_EXPORT(void) apr_table_mergen(apr_table_t *t, const char *key, elts->val = (char *)val; } -APR_EXPORT(void) apr_table_add(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_add(apr_table_t *t, const char *key, const char *val) { apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts; @@ -684,7 +684,7 @@ APR_EXPORT(void) apr_table_add(apr_table_t *t, const char *key, elts->val = apr_pstrdup(t->a.cont, val); } -APR_EXPORT(void) apr_btable_add(apr_btable_t *t, const char *key, +APR_DECLARE(void) apr_btable_add(apr_btable_t *t, const char *key, size_t size, const void *val) { apr_btable_entry_t *elts = (apr_btable_entry_t *) t->a.elts; @@ -699,7 +699,7 @@ APR_EXPORT(void) apr_btable_add(apr_btable_t *t, const char *key, elts->val = item; } -APR_EXPORT(void) apr_table_addn(apr_table_t *t, const char *key, +APR_DECLARE(void) apr_table_addn(apr_table_t *t, const char *key, const char *val) { apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts; @@ -722,7 +722,7 @@ APR_EXPORT(void) apr_table_addn(apr_table_t *t, const char *key, elts->val = (char *)val; } -APR_EXPORT(void) apr_btable_addn(apr_btable_t *t, const char *key, +APR_DECLARE(void) apr_btable_addn(apr_btable_t *t, const char *key, size_t size, const void *val) { apr_btable_entry_t *elts = (apr_btable_entry_t *) t->a.elts; @@ -750,7 +750,7 @@ APR_EXPORT(void) apr_btable_addn(apr_btable_t *t, const char *key, elts->val = item; } -APR_EXPORT(apr_table_t *) apr_overlay_tables(apr_pool_t *p, +APR_DECLARE(apr_table_t *) apr_overlay_tables(apr_pool_t *p, const apr_table_t *overlay, const apr_table_t *base) { @@ -782,7 +782,7 @@ APR_EXPORT(apr_table_t *) apr_overlay_tables(apr_pool_t *p, return res; } -APR_EXPORT(apr_btable_t *) apr_overlay_btables(apr_pool_t *p, +APR_DECLARE(apr_btable_t *) apr_overlay_btables(apr_pool_t *p, const apr_btable_t *overlay, const apr_btable_t *base) { @@ -857,7 +857,7 @@ APR_EXPORT(apr_btable_t *) apr_overlay_btables(apr_pool_t *p, * * So to make mod_file_cache easier to maintain, it's a good thing */ -APR_EXPORT(void) apr_table_do(int (*comp) (void *, const char *, const char *), +APR_DECLARE(void) apr_table_do(int (*comp) (void *, const char *, const char *), void *rec, const apr_table_t *t, ...) { va_list vp; @@ -865,7 +865,7 @@ APR_EXPORT(void) apr_table_do(int (*comp) (void *, const char *, const char *), apr_table_vdo(comp, rec, t, vp); va_end(vp); } -APR_EXPORT(void) apr_table_vdo(int (*comp) (void *, const char *, const char *), +APR_DECLARE(void) apr_table_vdo(int (*comp) (void *, const char *, const char *), void *rec, const apr_table_t *t, va_list vp) { char *argp; @@ -913,7 +913,7 @@ static int sort_overlap(const void *va, const void *vb) #define APR_OVERLAP_TABLES_ON_STACK (512) #endif -APR_EXPORT(void) apr_overlap_tables(apr_table_t *a, const apr_table_t *b, +APR_DECLARE(void) apr_overlap_tables(apr_table_t *a, const apr_table_t *b, unsigned flags) { overlap_key cat_keys_buf[APR_OVERLAP_TABLES_ON_STACK]; diff --git a/time/unix/timestr.c b/time/unix/timestr.c index 52aa1f148..9926e23a2 100644 --- a/time/unix/timestr.c +++ b/time/unix/timestr.c @@ -68,11 +68,11 @@ #endif /* End System Headers */ -APR_VAR_EXPORT const char apr_month_snames[12][4] = +APR_DECLARE_DATA const char apr_month_snames[12][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; -APR_VAR_EXPORT const char apr_day_snames[7][4] = +APR_DECLARE_DATA const char apr_day_snames[7][4] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; diff --git a/time/win32/timestr.c b/time/win32/timestr.c index 4f397cdd3..6df9dcc39 100644 --- a/time/win32/timestr.c +++ b/time/win32/timestr.c @@ -55,11 +55,11 @@ #include "atime.h" #include "apr_portable.h" -APR_VAR_EXPORT const char apr_month_snames[12][4] = +APR_DECLARE_DATA const char apr_month_snames[12][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; -APR_VAR_EXPORT const char apr_day_snames[7][4] = +APR_DECLARE_DATA const char apr_day_snames[7][4] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; |