diff options
35 files changed, 229 insertions, 213 deletions
@@ -26,7 +26,6 @@ CFG=aprlib - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe -RSC=rc.exe !IF "$(CFG)" == "aprlib - Win32 Release" @@ -40,11 +39,12 @@ RSC=rc.exe # PROP Output_Dir "LibR" # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX +RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "NDEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c +# SUBTRACT CPP /YX BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -65,11 +65,12 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX +RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "_DEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c +# SUBTRACT CPP /YX BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/aprlib.dsp b/aprlib.dsp index 38ebe77eb..138a620dd 100644 --- a/aprlib.dsp +++ b/aprlib.dsp @@ -26,7 +26,6 @@ CFG=aprlib - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe -RSC=rc.exe !IF "$(CFG)" == "aprlib - Win32 Release" @@ -40,11 +39,12 @@ RSC=rc.exe # PROP Output_Dir "LibR" # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX +RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "NDEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c +# SUBTRACT CPP /YX BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -65,11 +65,12 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX +RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "_DEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c +# SUBTRACT CPP /YX BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/aprlibdll.dsp b/aprlibdll.dsp index 0547a14b1..9fadaf51d 100644 --- a/aprlibdll.dsp +++ b/aprlibdll.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "NDEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/aprlib.dll" /libpath:"LibR" /base:@"..\..\os\win32\BaseAddr.ref",aprlib -# ADD LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/aprlib.dll" /libpath:"LibR" /base:@"..\..\os\win32\BaseAddr.ref",aprlib +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/aprlib.dll" /base:@"..\..\os\win32\BaseAddr.ref",aprlib !ELSEIF "$(CFG)" == "aprlibdll - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "_DEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /out:"Debug/aprlib.dll" /libpath:"LibD" /base:@"..\..\os\win32\BaseAddr.ref",aprlib -# ADD LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/aprlib.dll" /libpath:"LibD" /base:@"..\..\os\win32\BaseAddr.ref",aprlib +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/aprlib.dll" /base:@"..\..\os\win32\BaseAddr.ref",aprlib # SUBTRACT LINK32 /incremental:no /map !ENDIF diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c index d63ae1813..5fb3f72a3 100644 --- a/file_io/os2/readwrite.c +++ b/file_io/os2/readwrite.c @@ -325,7 +325,7 @@ ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile) -API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...) +APR_EXPORT(int) ap_fprintf(ap_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 d71c0205d..85e323e9d 100644 --- a/file_io/unix/readwrite.c +++ b/file_io/unix/readwrite.c @@ -393,7 +393,7 @@ static int printf_flush(ap_vformatter_buff_t *vbuff) } #endif -API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...) +APR_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...) { int cc; va_list ap; diff --git a/file_io/win32/fileio.h b/file_io/win32/fileio.h index 7d9adf353..55d6847d6 100644 --- a/file_io/win32/fileio.h +++ b/file_io/win32/fileio.h @@ -137,7 +137,7 @@ struct ap_dir_t { ap_status_t file_cleanup(void *); /*mode_t get_fileperms(ap_fileperms_t); */ -API_EXPORT(char *) ap_os_systemcase_filename(struct ap_pool_t *pCont, +APR_EXPORT(char *) ap_os_systemcase_filename(struct ap_pool_t *pCont, const char *szFile); char * canonical_filename(struct ap_pool_t *pCont, const char *szFile); diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c index 0f3d18b7e..8124f3fa6 100644 --- a/file_io/win32/readwrite.c +++ b/file_io/win32/readwrite.c @@ -322,7 +322,7 @@ static int printf_flush(ap_vformatter_buff_t *vbuff) return -1; } -API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...) +APR_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...) { int cc; va_list ap; diff --git a/include/apr.h.in b/include/apr.h.in index 91031e86e..98a9f6b42 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -93,11 +93,11 @@ typedef @off_t_value@ ap_off_t; /* Definitions that APR programs need to work properly. */ -#define API_THREAD_FUNC -#define API_EXPORT(type) type -#define API_EXPORT_NONSTD(type) type -#define API_VAR_IMPORT extern -#define API_VAR_EXPORT +#define APR_THREAD_FUNC +#define APR_EXPORT(type) type +#define APR_EXPORT_NONSTD(type) type +#define APR_IMPORT_VAR extern +#define APR_EXPORT_VAR /* Define APR_SSIZE_T_FMT. * If ssize_t is an integer we define it to be "d", diff --git a/include/apr.hw b/include/apr.hw index 1f346e4ec..ad9cc3e85 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -163,11 +163,25 @@ typedef int gid_t; /* Definitions that APR programs need to work properly. */ #define APR_SSIZE_T_FMT "d" -#define API_THREAD_FUNC __stdcall -#define API_EXPORT(type) type -#define API_EXPORT_NONSTD(type) type -#define API_VAR_IMPORT extern _declspec(dllimport) -#define API_VAR_EXPORT +#define APR_THREAD_FUNC __stdcall + +#if defined(APR_EXPORT_SYMBOLS) +#define APR_EXPORT(type) __declspec(dllexport) type +#define APR_EXPORT_NONSTD(type) __declspec(dllexport) type +#define APR_EXPORT_VAR __declspec(dllexport) +#define APR_IMPORT_VAR extern __declspec(dllexport) +#elif defined(APR_STATIC) +#define APR_EXPORT(type) type +#define APR_EXPORT_NONSTD(type) type +#define APR_EXPORT_VAR +#define APR_IMPORT_VAR extern +#else +/* Default behavior is to import the shared .dll */ +#define APR_EXPORT(type) __declspec(dllimport) type +#define APR_EXPORT_NONSTD(type) __declspec(dllimport) type +#define APR_EXPORT_VAR __declspec(dllimport) +#define APR_IMPORT_VAR extern __declspec(dllimport) +#endif #define ap_signal(a,b) signal(a,b) diff --git a/include/apr_file_io.h b/include/apr_file_io.h index 02f072de1..a58463ce6 100644 --- a/include/apr_file_io.h +++ b/include/apr_file_io.h @@ -391,7 +391,7 @@ B<Flush the file's buffer.> =cut */ ap_status_t ap_flush(ap_file_t *thefile); -API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...) +APR_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...) __attribute__((format(printf,2,3))); /* diff --git a/include/apr_fnmatch.h b/include/apr_fnmatch.h index c0300b638..ba27efd1c 100644 --- a/include/apr_fnmatch.h +++ b/include/apr_fnmatch.h @@ -51,11 +51,11 @@ extern "C" { /* This flag is an Apache addition */ #define FNM_CASE_BLIND 0x08 /* Compare characters case ap_pool_t nsensitively. */ -API_EXPORT(ap_status_t) ap_fnmatch(const char *pattern, const char *strings, +APR_EXPORT(ap_status_t) ap_fnmatch(const char *pattern, const char *strings, int flags); /* this function is an Apache addition */ -API_EXPORT(int) ap_is_fnmatch(const char *pattern); +APR_EXPORT(int) ap_is_fnmatch(const char *pattern); #ifdef __cplusplus } diff --git a/include/apr_getopt.h b/include/apr_getopt.h index f9ae7603f..e98d1e6da 100644 --- a/include/apr_getopt.h +++ b/include/apr_getopt.h @@ -55,12 +55,12 @@ #ifndef APR_GETOPT_H #define APR_GETOPT_H -API_VAR_IMPORT int +APR_IMPORT_VAR int ap_opterr, /* if error message should be printed */ ap_optind, /* index into parent argv vector */ ap_optopt, /* character checked for validity */ ap_optreset; /* reset getopt */ -API_VAR_IMPORT char * +APR_IMPORT_VAR char * ap_optarg; /* argument associated with option */ /* diff --git a/include/apr_lib.h b/include/apr_lib.h index 9f58b214c..f70675640 100644 --- a/include/apr_lib.h +++ b/include/apr_lib.h @@ -126,17 +126,17 @@ enum kill_conditions { /* * Define the prototypes for the various APR GP routines. */ -API_EXPORT(char *) ap_cpystrn(char *d, const char *s, size_t l); -API_EXPORT(ap_status_t) ap_tokenize_to_argv(const char *arg_str, +APR_EXPORT(char *) ap_cpystrn(char *d, const char *s, size_t l); +APR_EXPORT(ap_status_t) ap_tokenize_to_argv(const char *arg_str, char ***argv_out, ap_pool_t *token_context); -API_EXPORT(const char *) ap_filename_of_pathname(const char *pathname); -API_EXPORT(char *) ap_collapse_spaces(char *dest, const char *src); +APR_EXPORT(const char *) ap_filename_of_pathname(const char *pathname); +APR_EXPORT(char *) ap_collapse_spaces(char *dest, const char *src); -/*API_EXPORT(ap_mutex_t *) ap_create_mutex(void *m);*/ -API_EXPORT(int) ap_slack(int l, int h); -API_EXPORT_NONSTD(ap_status_t) ap_execle(const char *c, const char *a, ...); -API_EXPORT_NONSTD(ap_status_t) ap_execve(const char *c, const char *argv[], +/*APR_EXPORT(ap_mutex_t *) ap_create_mutex(void *m);*/ +APR_EXPORT(int) ap_slack(int l, int h); +APR_EXPORT_NONSTD(ap_status_t) ap_execle(const char *c, const char *a, ...); +APR_EXPORT_NONSTD(ap_status_t) ap_execve(const char *c, const char *argv[], const char *envp[]); #define ap_create_mutex(x) (0) @@ -230,7 +230,7 @@ API_EXPORT_NONSTD(ap_status_t) ap_execve(const char *c, const char *argv[], * or until ap_vformatter returns. */ -API_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff_t *b), +APR_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff_t *b), ap_vformatter_buff_t *c, const char *fmt, va_list ap); @@ -238,7 +238,7 @@ API_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff_t *b), /* A small routine to validate a plain text password with a password * that has been encrypted using any algorithm APR knows about. */ -API_EXPORT(ap_status_t) ap_validate_password(const char *passwd, const char *hash); +APR_EXPORT(ap_status_t) ap_validate_password(const char *passwd, const char *hash); /* @@ -257,22 +257,22 @@ API_EXPORT(ap_status_t) ap_validate_password(const char *passwd, const char *has * to distinguish between an output which was truncated, and an output which * exactly filled the buffer. */ -API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format, ...) +APR_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format, ...) __attribute__((format(printf,3,4))); -API_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format, +APR_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format, va_list ap); /* * APR memory structure manipulators (pools, tables, and arrays). */ -API_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retcode)); -API_EXPORT(void) ap_clear_pool(struct ap_pool_t *p); -API_EXPORT(void) ap_destroy_pool(struct ap_pool_t *p); -API_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p); -API_EXPORT(long) ap_bytes_in_free_blocks(void); -API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts); -API_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b); -API_EXPORT(void) ap_pool_join(ap_pool_t *p, ap_pool_t *sub); +APR_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retcode)); +APR_EXPORT(void) ap_clear_pool(struct ap_pool_t *p); +APR_EXPORT(void) ap_destroy_pool(struct ap_pool_t *p); +APR_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p); +APR_EXPORT(long) ap_bytes_in_free_blocks(void); +APR_EXPORT(ap_pool_t *) ap_find_pool(const void *ts); +APR_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b); +APR_EXPORT(void) ap_pool_join(ap_pool_t *p, ap_pool_t *sub); /* used to guarantee to the ap_pool_t debugging code that the sub ap_pool_t will not be * destroyed before the parent pool @@ -285,78 +285,78 @@ API_EXPORT(void) ap_pool_join(ap_pool_t *p, ap_pool_t *sub); #endif /* POOL_DEBUG */ -API_EXPORT(void *) ap_palloc(struct ap_pool_t *c, int reqsize); -API_EXPORT(void *) ap_pcalloc(struct ap_pool_t *p, int size); -API_EXPORT(char *) ap_pstrdup(struct ap_pool_t *p, const char *s); -API_EXPORT(char *) ap_pstrndup(struct ap_pool_t *p, const char *s, int n); -API_EXPORT_NONSTD(char *) ap_pstrcat(struct ap_pool_t *p, ...); -API_EXPORT(char *) ap_pvsprintf(struct ap_pool_t *p, const char *fmt, va_list ap); -API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_pool_t *p, const char *fmt, ...); -API_EXPORT(ap_array_header_t *) ap_make_array(struct ap_pool_t *p, int nelts, +APR_EXPORT(void *) ap_palloc(struct ap_pool_t *c, int reqsize); +APR_EXPORT(void *) ap_pcalloc(struct ap_pool_t *p, int size); +APR_EXPORT(char *) ap_pstrdup(struct ap_pool_t *p, const char *s); +APR_EXPORT(char *) ap_pstrndup(struct ap_pool_t *p, const char *s, int n); +APR_EXPORT_NONSTD(char *) ap_pstrcat(struct ap_pool_t *p, ...); +APR_EXPORT(char *) ap_pvsprintf(struct ap_pool_t *p, const char *fmt, va_list ap); +APR_EXPORT_NONSTD(char *) ap_psprintf(struct ap_pool_t *p, const char *fmt, ...); +APR_EXPORT(ap_array_header_t *) ap_make_array(struct ap_pool_t *p, int nelts, int elt_size); -API_EXPORT(void *) ap_push_array(ap_array_header_t *arr); -API_EXPORT(void) ap_array_cat(ap_array_header_t *dst, +APR_EXPORT(void *) ap_push_array(ap_array_header_t *arr); +APR_EXPORT(void) ap_array_cat(ap_array_header_t *dst, const ap_array_header_t *src); -API_EXPORT(ap_array_header_t *) ap_copy_array(struct ap_pool_t *p, +APR_EXPORT(ap_array_header_t *) ap_copy_array(struct ap_pool_t *p, const ap_array_header_t *arr); -API_EXPORT(ap_array_header_t *) +APR_EXPORT(ap_array_header_t *) ap_copy_array_hdr(struct ap_pool_t *p, const ap_array_header_t *arr); -API_EXPORT(ap_array_header_t *) +APR_EXPORT(ap_array_header_t *) ap_append_arrays(struct ap_pool_t *p, const ap_array_header_t *first, const ap_array_header_t *second); -API_EXPORT(char *) ap_array_pstrcat(struct ap_pool_t *p, +APR_EXPORT(char *) ap_array_pstrcat(struct ap_pool_t *p, const ap_array_header_t *arr, const char sep); -API_EXPORT(ap_table_t *) ap_make_table(struct ap_pool_t *p, int nelts); -API_EXPORT(ap_table_t *) ap_copy_table(struct ap_pool_t *p, const ap_table_t *t); -API_EXPORT(void) ap_clear_table(ap_table_t *t); -API_EXPORT(const char *) ap_table_get(const ap_table_t *t, const char *key); -API_EXPORT(void) ap_table_set(ap_table_t *t, const char *key, +APR_EXPORT(ap_table_t *) ap_make_table(struct ap_pool_t *p, int nelts); +APR_EXPORT(ap_table_t *) ap_copy_table(struct ap_pool_t *p, const ap_table_t *t); +APR_EXPORT(void) ap_clear_table(ap_table_t *t); +APR_EXPORT(const char *) ap_table_get(const ap_table_t *t, const char *key); +APR_EXPORT(void) ap_table_set(ap_table_t *t, const char *key, const char *val); -API_EXPORT(void) ap_table_setn(ap_table_t *t, const char *key, +APR_EXPORT(void) ap_table_setn(ap_table_t *t, const char *key, const char *val); -API_EXPORT(void) ap_table_unset(ap_table_t *t, const char *key); -API_EXPORT(void) ap_table_merge(ap_table_t *t, const char *key, +APR_EXPORT(void) ap_table_unset(ap_table_t *t, const char *key); +APR_EXPORT(void) ap_table_merge(ap_table_t *t, const char *key, const char *val); -API_EXPORT(void) ap_table_mergen(ap_table_t *t, const char *key, +APR_EXPORT(void) ap_table_mergen(ap_table_t *t, const char *key, const char *val); -API_EXPORT(void) ap_table_add(ap_table_t *t, const char *key, +APR_EXPORT(void) ap_table_add(ap_table_t *t, const char *key, const char *val); -API_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key, +APR_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key, const char *val); -API_EXPORT(ap_table_t *) ap_overlay_tables(struct ap_pool_t *p, +APR_EXPORT(ap_table_t *) ap_overlay_tables(struct ap_pool_t *p, const ap_table_t *overlay, const ap_table_t *base); -API_EXPORT(void) +APR_EXPORT(void) ap_table_do(int (*comp) (void *, const char *, const char *), void *rec, const ap_table_t *t, ...); #define AP_OVERLAP_TABLES_SET (0) #define AP_OVERLAP_TABLES_MERGE (1) -API_EXPORT(void) ap_overlap_tables(ap_table_t *a, const ap_table_t *b, +APR_EXPORT(void) ap_overlap_tables(ap_table_t *a, const ap_table_t *b, unsigned flags); -API_EXPORT(void) ap_register_cleanup(struct ap_pool_t *p, void *data, +APR_EXPORT(void) ap_register_cleanup(struct ap_pool_t *p, void *data, ap_status_t (*plain_cleanup) (void *), ap_status_t (*child_cleanup) (void *)); -API_EXPORT(void) ap_kill_cleanup(struct ap_pool_t *p, void *data, +APR_EXPORT(void) ap_kill_cleanup(struct ap_pool_t *p, void *data, ap_status_t (*cleanup) (void *)); -API_EXPORT(ap_status_t) ap_run_cleanup(struct ap_pool_t *p, void *data, +APR_EXPORT(ap_status_t) ap_run_cleanup(struct ap_pool_t *p, void *data, ap_status_t (*cleanup) (void *)); -API_EXPORT(void) ap_cleanup_for_exec(void); -API_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t *bufsize); -API_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data); +APR_EXPORT(void) ap_cleanup_for_exec(void); +APR_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t *bufsize); +APR_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data); -API_EXPORT(void) ap_note_subprocess(struct ap_pool_t *a, ap_proc_t *pid, +APR_EXPORT(void) ap_note_subprocess(struct ap_pool_t *a, ap_proc_t *pid, enum kill_conditions how); -API_EXPORT(int) +APR_EXPORT(int) ap_spawn_child(ap_pool_t *p, int (*func) (void *a, ap_child_info_t *c), void *data, enum kill_conditions kill_how, FILE **pipe_in, FILE **pipe_out, FILE **pipe_err); -API_EXPORT(char *) ap_cpystrn(char *dst, const char *src, size_t dst_size); +APR_EXPORT(char *) ap_cpystrn(char *dst, const char *src, size_t dst_size); #ifdef __cplusplus } diff --git a/include/apr_md5.h b/include/apr_md5.h index 8bdf1e303..25586c1d8 100644 --- a/include/apr_md5.h +++ b/include/apr_md5.h @@ -107,18 +107,18 @@ typedef struct { #endif } ap_md5_ctx_t; -API_EXPORT(ap_status_t) ap_MD5Init(ap_md5_ctx_t *context); +APR_EXPORT(ap_status_t) ap_MD5Init(ap_md5_ctx_t *context); #if APR_HAS_XLATE -API_EXPORT(ap_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, ap_xlate_t *xlate); +APR_EXPORT(ap_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, ap_xlate_t *xlate); #else #define ap_MD5SetXlate(context, xlate) APR_ENOTIMPL #endif -API_EXPORT(ap_status_t) ap_MD5Update(ap_md5_ctx_t *context, +APR_EXPORT(ap_status_t) ap_MD5Update(ap_md5_ctx_t *context, const unsigned char *input, unsigned int inputLen); -API_EXPORT(ap_status_t) ap_MD5Final(unsigned char digest[MD5_DIGESTSIZE], +APR_EXPORT(ap_status_t) ap_MD5Final(unsigned char digest[MD5_DIGESTSIZE], ap_md5_ctx_t *context); -API_EXPORT(ap_status_t) ap_MD5Encode(const char *password, const char *salt, +APR_EXPORT(ap_status_t) ap_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 c485464e2..5d46ba8b8 100644 --- a/include/apr_pools.h +++ b/include/apr_pools.h @@ -135,7 +135,7 @@ void ap_term_alloc(void); /* Tear down everything */ /* routines to allocate memory from an pool... */ -API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_pool_t *, const char *fmt, ...) +APR_EXPORT_NONSTD(char *) ap_psprintf(struct ap_pool_t *, const char *fmt, ...) __attribute__((format(printf,2,3))); /* array and alist management... keeping lists of things. @@ -234,8 +234,8 @@ extern int raise_sigstop_flags; /* Finally, some accounting */ -API_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p); -API_EXPORT(long) ap_bytes_in_free_blocks(void); +APR_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p); +APR_EXPORT(long) ap_bytes_in_free_blocks(void); #ifdef __cplusplus } diff --git a/include/apr_thread_proc.h b/include/apr_thread_proc.h index fe56ac5ee..bcf3b5013 100644 --- a/include/apr_thread_proc.h +++ b/include/apr_thread_proc.h @@ -103,7 +103,7 @@ typedef struct ap_threadkey_t ap_threadkey_t; typedef struct ap_other_child_rec_t ap_other_child_rec_t; #endif /* APR_HAS_OTHER_CHILD */ -typedef void *(API_THREAD_FUNC *ap_thread_start_t)(void *); +typedef void *(APR_THREAD_FUNC *ap_thread_start_t)(void *); /* Thread Function definitions */ diff --git a/include/apr_time.h b/include/apr_time.h index e38cdb84b..c423c068b 100644 --- a/include/apr_time.h +++ b/include/apr_time.h @@ -62,8 +62,8 @@ extern "C" { #endif /* __cplusplus */ -API_VAR_IMPORT const char ap_month_snames[12][4]; -API_VAR_IMPORT const char ap_day_snames[7][4]; +APR_IMPORT_VAR const char ap_month_snames[12][4]; +APR_IMPORT_VAR const char ap_day_snames[7][4]; /* number of microseconds since 00:00:00 january 1, 1970 UTC */ typedef ap_int64_t ap_time_t; diff --git a/include/arch/win32/fileio.h b/include/arch/win32/fileio.h index 7d9adf353..55d6847d6 100644 --- a/include/arch/win32/fileio.h +++ b/include/arch/win32/fileio.h @@ -137,7 +137,7 @@ struct ap_dir_t { ap_status_t file_cleanup(void *); /*mode_t get_fileperms(ap_fileperms_t); */ -API_EXPORT(char *) ap_os_systemcase_filename(struct ap_pool_t *pCont, +APR_EXPORT(char *) ap_os_systemcase_filename(struct ap_pool_t *pCont, const char *szFile); char * canonical_filename(struct ap_pool_t *pCont, const char *szFile); diff --git a/lib/apr_cpystrn.c b/lib/apr_cpystrn.c index 3e67baa36..160e0b9e9 100644 --- a/lib/apr_cpystrn.c +++ b/lib/apr_cpystrn.c @@ -78,7 +78,7 @@ * ap_cpystrn() follows the same call structure as strncpy(). */ -API_EXPORT(char *) ap_cpystrn(char *dst, const char *src, size_t dst_size) +APR_EXPORT(char *) ap_cpystrn(char *dst, const char *src, size_t dst_size) { char *d, *end; @@ -118,7 +118,7 @@ API_EXPORT(char *) ap_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. */ -API_EXPORT(ap_status_t) ap_tokenize_to_argv(const char *arg_str, +APR_EXPORT(ap_status_t) ap_tokenize_to_argv(const char *arg_str, char ***argv_out, ap_pool_t *token_context) { @@ -232,7 +232,7 @@ const char *ap_filename_of_pathname(const char *pathname) * collapse in place (src == dest) is legal. * returns terminating null ptr to dest string. */ -API_EXPORT(char *) ap_collapse_spaces(char *dest, const char *src) +APR_EXPORT(char *) ap_collapse_spaces(char *dest, const char *src) { while (*src) { if (!ap_isspace(*src)) diff --git a/lib/apr_fnmatch.c b/lib/apr_fnmatch.c index 9936917b5..b8449ef37 100644 --- a/lib/apr_fnmatch.c +++ b/lib/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); -API_EXPORT(ap_status_t) ap_fnmatch(const char *pattern, const char *string, int flags) +APR_EXPORT(ap_status_t) ap_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 */ -API_EXPORT(int) ap_is_fnmatch(const char *pattern) +APR_EXPORT(int) ap_is_fnmatch(const char *pattern) { int nesting; diff --git a/lib/apr_getpass.c b/lib/apr_getpass.c index 4afea4a85..13cac5f78 100644 --- a/lib/apr_getpass.c +++ b/lib/apr_getpass.c @@ -203,7 +203,7 @@ static char *getpass(const char *prompt) * but the caller is *not* made aware of it. */ -API_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t *bufsiz) +APR_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t *bufsiz) { char *pw_got = NULL; int result = 0; diff --git a/lib/apr_hash.c b/lib/apr_hash.c index 1242aac75..5033c8a08 100644 --- a/lib/apr_hash.c +++ b/lib/apr_hash.c @@ -127,7 +127,7 @@ static ap_hash_entry_t **alloc_array(ap_hash_t *ht) return ap_pcalloc(ht->pool, sizeof(*ht->array) * (ht->max + 1)); } -API_EXPORT(ap_hash_t *) ap_make_hash(ap_pool_t *pool) +APR_EXPORT(ap_hash_t *) ap_make_hash(ap_pool_t *pool) { ap_hash_t *ht; ht = ap_palloc(pool, sizeof(ap_hash_t)); @@ -143,7 +143,7 @@ API_EXPORT(ap_hash_t *) ap_make_hash(ap_pool_t *pool) * Hash iteration functions. */ -API_EXPORT(ap_hash_index_t *) ap_hash_next(ap_hash_index_t *hi) +APR_EXPORT(ap_hash_index_t *) ap_hash_next(ap_hash_index_t *hi) { hi->this = hi->next; while (!hi->this) { @@ -155,7 +155,7 @@ API_EXPORT(ap_hash_index_t *) ap_hash_next(ap_hash_index_t *hi) return hi; } -API_EXPORT(ap_hash_index_t *) ap_hash_first(ap_hash_t *ht) +APR_EXPORT(ap_hash_index_t *) ap_hash_first(ap_hash_t *ht) { ap_hash_index_t *hi; hi = ap_palloc(ht->pool, sizeof(*hi)); @@ -166,7 +166,7 @@ API_EXPORT(ap_hash_index_t *) ap_hash_first(ap_hash_t *ht) return ap_hash_next(hi); } -API_EXPORT(void) ap_hash_this(ap_hash_index_t *hi, +APR_EXPORT(void) ap_hash_this(ap_hash_index_t *hi, void **key, size_t *klen, void **val) @@ -253,7 +253,7 @@ static ap_hash_entry_t **find_entry(ap_hash_t *ht, return hep; } -API_EXPORT(void *) ap_hash_get(ap_hash_t *ht, +APR_EXPORT(void *) ap_hash_get(ap_hash_t *ht, void *key, size_t klen) { @@ -265,7 +265,7 @@ API_EXPORT(void *) ap_hash_get(ap_hash_t *ht, return NULL; } -API_EXPORT(void) ap_hash_set(ap_hash_t *ht, +APR_EXPORT(void) ap_hash_set(ap_hash_t *ht, void *key, size_t klen, void *val) diff --git a/lib/apr_md5.c b/lib/apr_md5.c index a6b6c897b..1ba56bff6 100644 --- a/lib/apr_md5.c +++ b/lib/apr_md5.c @@ -185,7 +185,7 @@ static ap_xlate_t *xlate_ebcdic_to_ascii; /* used in ap_MD5Encode() */ /* MD5 initialization. Begins an MD5 operation, writing a new context. */ -API_EXPORT(ap_status_t) ap_MD5Init(ap_md5_ctx_t *context) +APR_EXPORT(ap_status_t) ap_MD5Init(ap_md5_ctx_t *context) { context->count[0] = context->count[1] = 0; /* Load magic initialization constants. */ @@ -204,7 +204,7 @@ API_EXPORT(ap_status_t) ap_MD5Init(ap_md5_ctx_t *context) * to be used for translating the content before calculating the * digest. */ -API_EXPORT(ap_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, ap_xlate_t *xlate) +APR_EXPORT(ap_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, ap_xlate_t *xlate) { ap_status_t rv; int is_sb; @@ -227,7 +227,7 @@ API_EXPORT(ap_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, ap_xlate_t *xlate) operation, processing another message block, and updating the context. */ -API_EXPORT(ap_status_t) ap_MD5Update(ap_md5_ctx_t *context, +APR_EXPORT(ap_status_t) ap_MD5Update(ap_md5_ctx_t *context, const unsigned char *input, unsigned int inputLen) { @@ -308,7 +308,7 @@ API_EXPORT(ap_status_t) ap_MD5Update(ap_md5_ctx_t *context, /* MD5 finalization. Ends an MD5 message-digest operation, writing the the message digest and zeroizing the context. */ -API_EXPORT(ap_status_t) ap_MD5Final(unsigned char digest[MD5_DIGESTSIZE], +APR_EXPORT(ap_status_t) ap_MD5Final(unsigned char digest[MD5_DIGESTSIZE], ap_md5_ctx_t *context) { unsigned char bits[8]; @@ -458,7 +458,7 @@ static void Decode(UINT4 *output, const unsigned char *input, unsigned int len) } #ifdef CHARSET_EBCDIC -API_EXPORT(ap_status_t) ap_MD5InitEBCDIC(ap_xlate_t *xlate) +APR_EXPORT(ap_status_t) ap_MD5InitEBCDIC(ap_xlate_t *xlate) { xlate_ebcdic_to_ascii = xlate; return APR_SUCCESS; @@ -488,7 +488,7 @@ static void to64(char *s, unsigned long v, int n) } } -API_EXPORT(ap_status_t) ap_MD5Encode(const char *pw, const char *salt, +APR_EXPORT(ap_status_t) ap_MD5Encode(const char *pw, const char *salt, char *result, size_t nbytes) { /* @@ -648,7 +648,7 @@ API_EXPORT(ap_status_t) ap_MD5Encode(const char *pw, const char *salt, * APR_EMISMATCH if they don't. */ -API_EXPORT(ap_status_t) ap_validate_password(const char *passwd, const char *hash) +APR_EXPORT(ap_status_t) ap_validate_password(const char *passwd, const char *hash) { char sample[120]; #ifndef WIN32 diff --git a/lib/apr_pools.c b/lib/apr_pools.c index c8976ba54..f91f91608 100644 --- a/lib/apr_pools.c +++ b/lib/apr_pools.c @@ -492,7 +492,7 @@ static ap_pool_t *permanent_pool; #define POOL_HDR_CLICKS (1 + ((sizeof(struct ap_pool_t) - 1) / CLICK_SZ)) #define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ) -API_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retcode)) +APR_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retcode)) { union block_hdr *blok; ap_pool_t *new_pool; @@ -573,7 +573,7 @@ struct cleanup { struct cleanup *next; }; -API_EXPORT(void) ap_register_cleanup(ap_pool_t *p, void *data, +APR_EXPORT(void) ap_register_cleanup(ap_pool_t *p, void *data, ap_status_t (*plain_cleanup) (void *), ap_status_t (*child_cleanup) (void *)) { @@ -589,7 +589,7 @@ API_EXPORT(void) ap_register_cleanup(ap_pool_t *p, void *data, } } -API_EXPORT(void) ap_kill_cleanup(ap_pool_t *p, void *data, +APR_EXPORT(void) ap_kill_cleanup(ap_pool_t *p, void *data, ap_status_t (*cleanup) (void *)) { struct cleanup *c; @@ -610,7 +610,7 @@ API_EXPORT(void) ap_kill_cleanup(ap_pool_t *p, void *data, } } -API_EXPORT(ap_status_t) ap_run_cleanup(ap_pool_t *p, void *data, +APR_EXPORT(ap_status_t) ap_run_cleanup(ap_pool_t *p, void *data, ap_status_t (*cleanup) (void *)) { ap_kill_cleanup(p, data, cleanup); @@ -643,7 +643,7 @@ static void cleanup_pool_for_exec(ap_pool_t *p) } } -API_EXPORT(void) ap_cleanup_for_exec(void) +APR_EXPORT(void) ap_cleanup_for_exec(void) { #if !defined(WIN32) && !defined(OS2) /* @@ -659,7 +659,7 @@ API_EXPORT(void) ap_cleanup_for_exec(void) #endif /* ndef WIN32 */ } -API_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data) +APR_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data) { /* do nothing cleanup routine */ return APR_SUCCESS; @@ -712,7 +712,7 @@ void ap_term_alloc(void) * This way, we are garaunteed that we only lock this mutex once when calling * either one of these functions. */ -API_EXPORT(void) ap_clear_pool(ap_pool_t *a) +APR_EXPORT(void) ap_clear_pool(ap_pool_t *a) { while (a->sub_pools) { ap_destroy_pool(a->sub_pools); @@ -747,7 +747,7 @@ API_EXPORT(void) ap_clear_pool(ap_pool_t *a) #endif } -API_EXPORT(void) ap_destroy_pool(ap_pool_t *a) +APR_EXPORT(void) ap_destroy_pool(ap_pool_t *a) { ap_clear_pool(a); #if APR_HAS_THREADS @@ -771,11 +771,11 @@ API_EXPORT(void) ap_destroy_pool(ap_pool_t *a) free_blocks(a->first); } -API_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p) +APR_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p) { return bytes_in_block_list(p->first); } -API_EXPORT(long) ap_bytes_in_free_blocks(void) +APR_EXPORT(long) ap_bytes_in_free_blocks(void) { return bytes_in_block_list(block_freelist); } @@ -798,7 +798,7 @@ extern char _end; /* Find the pool that ts belongs to, return NULL if it doesn't * belong to any pool. */ -API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts, int (apr_abort)(int retcode)) +APR_EXPORT(ap_pool_t *) ap_find_pool(const void *ts, int (apr_abort)(int retcode)) { const char *s = ts; union block_hdr **pb; @@ -842,7 +842,7 @@ API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts, int (apr_abort)(int retcode /* return TRUE iff a is an ancestor of b * NULL is considered an ancestor of all pools */ -API_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b) +APR_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b) { if (a == NULL) { return 1; @@ -864,7 +864,7 @@ API_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b) * instead. This is a guarantee by the caller that sub will not * be destroyed before p is. */ -API_EXPORT(void) ap_pool_join(ap_pool_t *p, ap_pool_t *sub, +APR_EXPORT(void) ap_pool_join(ap_pool_t *p, ap_pool_t *sub, int (*apr_abort)(int retcode)) { union block_hdr *b; @@ -979,14 +979,14 @@ void * ap_palloc(ap_pool_t *a, int reqsize) #endif } -API_EXPORT(void *) ap_pcalloc(ap_pool_t *a, int size) +APR_EXPORT(void *) ap_pcalloc(ap_pool_t *a, int size) { void *res = ap_palloc(a, size); memset(res, '\0', size); return res; } -API_EXPORT(char *) ap_pstrdup(ap_pool_t *a, const char *s) +APR_EXPORT(char *) ap_pstrdup(ap_pool_t *a, const char *s) { char *res; size_t len; @@ -1000,7 +1000,7 @@ API_EXPORT(char *) ap_pstrdup(ap_pool_t *a, const char *s) return res; } -API_EXPORT(char *) ap_pstrndup(ap_pool_t *a, const char *s, int n) +APR_EXPORT(char *) ap_pstrndup(ap_pool_t *a, const char *s, int n) { char *res; @@ -1013,7 +1013,7 @@ API_EXPORT(char *) ap_pstrndup(ap_pool_t *a, const char *s, int n) return res; } -API_EXPORT_NONSTD(char *) ap_pstrcat(ap_pool_t *a, ...) +APR_EXPORT_NONSTD(char *) ap_pstrcat(ap_pool_t *a, ...) { char *cp, *argp, *res; @@ -1138,7 +1138,7 @@ static int psprintf_flush(ap_vformatter_buff_t *vbuff) #endif } -API_EXPORT(char *) ap_pvsprintf(ap_pool_t *p, const char *fmt, va_list ap) +APR_EXPORT(char *) ap_pvsprintf(ap_pool_t *p, const char *fmt, va_list ap) { #ifdef ALLOC_USE_MALLOC struct psprintf_data ps; @@ -1197,7 +1197,7 @@ API_EXPORT(char *) ap_pvsprintf(ap_pool_t *p, const char *fmt, va_list ap) #endif } -API_EXPORT_NONSTD(char *) ap_psprintf(ap_pool_t *p, const char *fmt, ...) +APR_EXPORT_NONSTD(char *) ap_psprintf(ap_pool_t *p, const char *fmt, ...) { va_list ap; char *res; @@ -1220,7 +1220,7 @@ API_EXPORT_NONSTD(char *) ap_psprintf(ap_pool_t *p, const char *fmt, ...) * generic interface, but for now, it's a special case */ -API_EXPORT(void) ap_note_subprocess(ap_pool_t *a, ap_proc_t *pid, +APR_EXPORT(void) ap_note_subprocess(ap_pool_t *a, ap_proc_t *pid, enum kill_conditions how) { struct process_chain *new = diff --git a/lib/apr_snprintf.c b/lib/apr_snprintf.c index 354843a3d..5f9da4677 100644 --- a/lib/apr_snprintf.c +++ b/lib/apr_snprintf.c @@ -655,7 +655,7 @@ static char *conv_p2_quad(u_widest_int num, register int nbits, /* * Do format conversion placing the output in buffer */ -API_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff_t *), +APR_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff_t *), ap_vformatter_buff_t *vbuff, const char *fmt, va_list ap) { register char *sp; @@ -1157,7 +1157,7 @@ static int snprintf_flush(ap_vformatter_buff_t *vbuff) } -API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...) +APR_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...) { int cc; va_list ap; @@ -1177,7 +1177,7 @@ API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...) } -API_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format, +APR_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format, va_list ap) { int cc; diff --git a/lib/apr_tables.c b/lib/apr_tables.c index 79181ab82..b42b1d6ce 100644 --- a/lib/apr_tables.c +++ b/lib/apr_tables.c @@ -103,7 +103,7 @@ static void make_array_core(ap_array_header_t *res, ap_pool_t *c, res->nalloc = nelts; /* ...but this many allocated */ } -API_EXPORT(ap_array_header_t *) ap_make_array(ap_pool_t *p, +APR_EXPORT(ap_array_header_t *) ap_make_array(ap_pool_t *p, int nelts, int elt_size) { ap_array_header_t *res; @@ -113,7 +113,7 @@ API_EXPORT(ap_array_header_t *) ap_make_array(ap_pool_t *p, return res; } -API_EXPORT(void *) ap_push_array(ap_array_header_t *arr) +APR_EXPORT(void *) ap_push_array(ap_array_header_t *arr) { if (arr->nelts == arr->nalloc) { int new_size = (arr->nalloc <= 0) ? 1 : arr->nalloc * 2; @@ -130,7 +130,7 @@ API_EXPORT(void *) ap_push_array(ap_array_header_t *arr) return arr->elts + (arr->elt_size * (arr->nelts - 1)); } -API_EXPORT(void) ap_array_cat(ap_array_header_t *dst, +APR_EXPORT(void) ap_array_cat(ap_array_header_t *dst, const ap_array_header_t *src) { int elt_size = dst->elt_size; @@ -155,7 +155,7 @@ API_EXPORT(void) ap_array_cat(ap_array_header_t *dst, dst->nelts += src->nelts; } -API_EXPORT(ap_array_header_t *) ap_copy_array(ap_pool_t *p, +APR_EXPORT(ap_array_header_t *) ap_copy_array(ap_pool_t *p, const ap_array_header_t *arr) { ap_array_header_t *res = ap_make_array(p, arr->nalloc, arr->elt_size); @@ -181,7 +181,7 @@ static APR_INLINE void copy_array_hdr_core(ap_array_header_t *res, res->nalloc = arr->nelts; /* Force overflow on push */ } -API_EXPORT(ap_array_header_t *) +APR_EXPORT(ap_array_header_t *) ap_copy_array_hdr(ap_pool_t *p, const ap_array_header_t *arr) { @@ -195,7 +195,7 @@ API_EXPORT(ap_array_header_t *) /* The above is used here to avoid consing multiple new array bodies... */ -API_EXPORT(ap_array_header_t *) +APR_EXPORT(ap_array_header_t *) ap_append_arrays(ap_pool_t *p, const ap_array_header_t *first, const ap_array_header_t *second) @@ -212,7 +212,7 @@ API_EXPORT(ap_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. */ -API_EXPORT(char *) ap_array_pstrcat(ap_pool_t *p, +APR_EXPORT(char *) ap_array_pstrcat(ap_pool_t *p, const ap_array_header_t *arr, const char sep) { @@ -289,7 +289,7 @@ static ap_table_entry_t *table_push(ap_table_t *t) #endif /* MAKE_TABLE_PROFILE */ -API_EXPORT(ap_table_t *) ap_make_table(ap_pool_t *p, int nelts) +APR_EXPORT(ap_table_t *) ap_make_table(ap_pool_t *p, int nelts) { ap_table_t *t = ap_palloc(p, sizeof(ap_table_t)); @@ -300,7 +300,7 @@ API_EXPORT(ap_table_t *) ap_make_table(ap_pool_t *p, int nelts) return t; } -API_EXPORT(ap_table_t *) ap_copy_table(ap_pool_t *p, const ap_table_t *t) +APR_EXPORT(ap_table_t *) ap_copy_table(ap_pool_t *p, const ap_table_t *t) { ap_table_t *new = ap_palloc(p, sizeof(ap_table_t)); @@ -319,12 +319,12 @@ API_EXPORT(ap_table_t *) ap_copy_table(ap_pool_t *p, const ap_table_t *t) return new; } -API_EXPORT(void) ap_clear_table(ap_table_t *t) +APR_EXPORT(void) ap_clear_table(ap_table_t *t) { t->a.nelts = 0; } -API_EXPORT(const char *) ap_table_get(const ap_table_t *t, const char *key) +APR_EXPORT(const char *) ap_table_get(const ap_table_t *t, const char *key) { ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts; int i; @@ -342,7 +342,7 @@ API_EXPORT(const char *) ap_table_get(const ap_table_t *t, const char *key) return NULL; } -API_EXPORT(void) ap_table_set(ap_table_t *t, const char *key, +APR_EXPORT(void) ap_table_set(ap_table_t *t, const char *key, const char *val) { register int i, j, k; @@ -376,7 +376,7 @@ API_EXPORT(void) ap_table_set(ap_table_t *t, const char *key, } } -API_EXPORT(void) ap_table_setn(ap_table_t *t, const char *key, +APR_EXPORT(void) ap_table_setn(ap_table_t *t, const char *key, const char *val) { register int i, j, k; @@ -423,7 +423,7 @@ API_EXPORT(void) ap_table_setn(ap_table_t *t, const char *key, } } -API_EXPORT(void) ap_table_unset(ap_table_t *t, const char *key) +APR_EXPORT(void) ap_table_unset(ap_table_t *t, const char *key) { register int i, j, k; ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts; @@ -448,7 +448,7 @@ API_EXPORT(void) ap_table_unset(ap_table_t *t, const char *key) } } -API_EXPORT(void) ap_table_merge(ap_table_t *t, const char *key, +APR_EXPORT(void) ap_table_merge(ap_table_t *t, const char *key, const char *val) { ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts; @@ -466,7 +466,7 @@ API_EXPORT(void) ap_table_merge(ap_table_t *t, const char *key, elts->val = ap_pstrdup(t->a.cont, val); } -API_EXPORT(void) ap_table_mergen(ap_table_t *t, const char *key, +APR_EXPORT(void) ap_table_mergen(ap_table_t *t, const char *key, const char *val) { ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts; @@ -497,7 +497,7 @@ API_EXPORT(void) ap_table_mergen(ap_table_t *t, const char *key, elts->val = (char *)val; } -API_EXPORT(void) ap_table_add(ap_table_t *t, const char *key, +APR_EXPORT(void) ap_table_add(ap_table_t *t, const char *key, const char *val) { ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts; @@ -507,7 +507,7 @@ API_EXPORT(void) ap_table_add(ap_table_t *t, const char *key, elts->val = ap_pstrdup(t->a.cont, val); } -API_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key, +APR_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key, const char *val) { ap_table_entry_t *elts = (ap_table_entry_t *) t->a.elts; @@ -530,7 +530,7 @@ API_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key, elts->val = (char *)val; } -API_EXPORT(ap_table_t *) ap_overlay_tables(ap_pool_t *p, +APR_EXPORT(ap_table_t *) ap_overlay_tables(ap_pool_t *p, const ap_table_t *overlay, const ap_table_t *base) { @@ -584,7 +584,7 @@ API_EXPORT(ap_table_t *) ap_overlay_tables(ap_pool_t *p, * Note that rec is simply passed-on to the comp function, so that the * caller can pass additional info for the task. */ -API_EXPORT(void) ap_table_do(int (*comp) (void *, const char *, const char *), +APR_EXPORT(void) ap_table_do(int (*comp) (void *, const char *, const char *), void *rec, const ap_table_t *t, ...) { va_list vp; @@ -639,7 +639,7 @@ static int sort_overlap(const void *va, const void *vb) #define ap_OVERLAP_TABLES_ON_STACK (512) #endif -API_EXPORT(void) ap_overlap_tables(ap_table_t *a, const ap_table_t *b, +APR_EXPORT(void) ap_overlap_tables(ap_table_t *a, const ap_table_t *b, unsigned flags) { overlap_key cat_keys_buf[ap_OVERLAP_TABLES_ON_STACK]; diff --git a/libapr.dsp b/libapr.dsp index 0547a14b1..9fadaf51d 100644 --- a/libapr.dsp +++ b/libapr.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "NDEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/aprlib.dll" /libpath:"LibR" /base:@"..\..\os\win32\BaseAddr.ref",aprlib -# ADD LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/aprlib.dll" /libpath:"LibR" /base:@"..\..\os\win32\BaseAddr.ref",aprlib +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/aprlib.dll" /base:@"..\..\os\win32\BaseAddr.ref",aprlib !ELSEIF "$(CFG)" == "aprlibdll - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "_DEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /out:"Debug/aprlib.dll" /libpath:"LibD" /base:@"..\..\os\win32\BaseAddr.ref",aprlib -# ADD LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/aprlib.dll" /libpath:"LibD" /base:@"..\..\os\win32\BaseAddr.ref",aprlib +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/aprlib.dll" /base:@"..\..\os\win32\BaseAddr.ref",aprlib # SUBTRACT LINK32 /incremental:no /map !ENDIF diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index c8976ba54..f91f91608 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -492,7 +492,7 @@ static ap_pool_t *permanent_pool; #define POOL_HDR_CLICKS (1 + ((sizeof(struct ap_pool_t) - 1) / CLICK_SZ)) #define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ) -API_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retcode)) +APR_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retcode)) { union block_hdr *blok; ap_pool_t *new_pool; @@ -573,7 +573,7 @@ struct cleanup { struct cleanup *next; }; -API_EXPORT(void) ap_register_cleanup(ap_pool_t *p, void *data, +APR_EXPORT(void) ap_register_cleanup(ap_pool_t *p, void *data, ap_status_t (*plain_cleanup) (void *), ap_status_t (*child_cleanup) (void *)) { @@ -589,7 +589,7 @@ API_EXPORT(void) ap_register_cleanup(ap_pool_t *p, void *data, } } -API_EXPORT(void) ap_kill_cleanup(ap_pool_t *p, void *data, +APR_EXPORT(void) ap_kill_cleanup(ap_pool_t *p, void *data, ap_status_t (*cleanup) (void *)) { struct cleanup *c; @@ -610,7 +610,7 @@ API_EXPORT(void) ap_kill_cleanup(ap_pool_t *p, void *data, } } -API_EXPORT(ap_status_t) ap_run_cleanup(ap_pool_t *p, void *data, +APR_EXPORT(ap_status_t) ap_run_cleanup(ap_pool_t *p, void *data, ap_status_t (*cleanup) (void *)) { ap_kill_cleanup(p, data, cleanup); @@ -643,7 +643,7 @@ static void cleanup_pool_for_exec(ap_pool_t *p) } } -API_EXPORT(void) ap_cleanup_for_exec(void) +APR_EXPORT(void) ap_cleanup_for_exec(void) { #if !defined(WIN32) && !defined(OS2) /* @@ -659,7 +659,7 @@ API_EXPORT(void) ap_cleanup_for_exec(void) #endif /* ndef WIN32 */ } -API_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data) +APR_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data) { /* do nothing cleanup routine */ return APR_SUCCESS; @@ -712,7 +712,7 @@ void ap_term_alloc(void) * This way, we are garaunteed that we only lock this mutex once when calling * either one of these functions. */ -API_EXPORT(void) ap_clear_pool(ap_pool_t *a) +APR_EXPORT(void) ap_clear_pool(ap_pool_t *a) { while (a->sub_pools) { ap_destroy_pool(a->sub_pools); @@ -747,7 +747,7 @@ API_EXPORT(void) ap_clear_pool(ap_pool_t *a) #endif } -API_EXPORT(void) ap_destroy_pool(ap_pool_t *a) +APR_EXPORT(void) ap_destroy_pool(ap_pool_t *a) { ap_clear_pool(a); #if APR_HAS_THREADS @@ -771,11 +771,11 @@ API_EXPORT(void) ap_destroy_pool(ap_pool_t *a) free_blocks(a->first); } -API_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p) +APR_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p) { return bytes_in_block_list(p->first); } -API_EXPORT(long) ap_bytes_in_free_blocks(void) +APR_EXPORT(long) ap_bytes_in_free_blocks(void) { return bytes_in_block_list(block_freelist); } @@ -798,7 +798,7 @@ extern char _end; /* Find the pool that ts belongs to, return NULL if it doesn't * belong to any pool. */ -API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts, int (apr_abort)(int retcode)) +APR_EXPORT(ap_pool_t *) ap_find_pool(const void *ts, int (apr_abort)(int retcode)) { const char *s = ts; union block_hdr **pb; @@ -842,7 +842,7 @@ API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts, int (apr_abort)(int retcode /* return TRUE iff a is an ancestor of b * NULL is considered an ancestor of all pools */ -API_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b) +APR_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b) { if (a == NULL) { return 1; @@ -864,7 +864,7 @@ API_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b) * instead. This is a guarantee by the caller that sub will not * be destroyed before p is. */ -API_EXPORT(void) ap_pool_join(ap_pool_t *p, ap_pool_t *sub, +APR_EXPORT(void) ap_pool_join(ap_pool_t *p, ap_pool_t *sub, int (*apr_abort)(int retcode)) { union block_hdr *b; @@ -979,14 +979,14 @@ void * ap_palloc(ap_pool_t *a, int reqsize) #endif } -API_EXPORT(void *) ap_pcalloc(ap_pool_t *a, int size) +APR_EXPORT(void *) ap_pcalloc(ap_pool_t *a, int size) { void *res = ap_palloc(a, size); memset(res, '\0', size); return res; } -API_EXPORT(char *) ap_pstrdup(ap_pool_t *a, const char *s) +APR_EXPORT(char *) ap_pstrdup(ap_pool_t *a, const char *s) { char *res; size_t len; @@ -1000,7 +1000,7 @@ API_EXPORT(char *) ap_pstrdup(ap_pool_t *a, const char *s) return res; } -API_EXPORT(char *) ap_pstrndup(ap_pool_t *a, const char *s, int n) +APR_EXPORT(char *) ap_pstrndup(ap_pool_t *a, const char *s, int n) { char *res; @@ -1013,7 +1013,7 @@ API_EXPORT(char *) ap_pstrndup(ap_pool_t *a, const char *s, int n) return res; } -API_EXPORT_NONSTD(char *) ap_pstrcat(ap_pool_t *a, ...) +APR_EXPORT_NONSTD(char *) ap_pstrcat(ap_pool_t *a, ...) { char *cp, *argp, *res; @@ -1138,7 +1138,7 @@ static int psprintf_flush(ap_vformatter_buff_t *vbuff) #endif } -API_EXPORT(char *) ap_pvsprintf(ap_pool_t *p, const char *fmt, va_list ap) +APR_EXPORT(char *) ap_pvsprintf(ap_pool_t *p, const char *fmt, va_list ap) { #ifdef ALLOC_USE_MALLOC struct psprintf_data ps; @@ -1197,7 +1197,7 @@ API_EXPORT(char *) ap_pvsprintf(ap_pool_t *p, const char *fmt, va_list ap) #endif } -API_EXPORT_NONSTD(char *) ap_psprintf(ap_pool_t *p, const char *fmt, ...) +APR_EXPORT_NONSTD(char *) ap_psprintf(ap_pool_t *p, const char *fmt, ...) { va_list ap; char *res; @@ -1220,7 +1220,7 @@ API_EXPORT_NONSTD(char *) ap_psprintf(ap_pool_t *p, const char *fmt, ...) * generic interface, but for now, it's a special case */ -API_EXPORT(void) ap_note_subprocess(ap_pool_t *a, ap_proc_t *pid, +APR_EXPORT(void) ap_note_subprocess(ap_pool_t *a, ap_proc_t *pid, enum kill_conditions how) { struct process_chain *new = diff --git a/misc/unix/getopt.c b/misc/unix/getopt.c index 776d2e224..d7d788c70 100644 --- a/misc/unix/getopt.c +++ b/misc/unix/getopt.c @@ -33,12 +33,12 @@ #include "misc.h" -API_VAR_EXPORT int +APR_EXPORT_VAR int ap_opterr = 1, /* if error message should be printed */ ap_optind = 1, /* index into parent argv vector */ ap_optopt, /* character checked for validity */ ap_optreset; /* reset getopt */ -API_VAR_EXPORT char *ap_optarg = ""; /* argument associated with option */ +APR_EXPORT_VAR char *ap_optarg = ""; /* argument associated with option */ #define EMSG "" diff --git a/misc/unix/otherchild.c b/misc/unix/otherchild.c index 9c752656f..e3f7e5172 100644 --- a/misc/unix/otherchild.c +++ b/misc/unix/otherchild.c @@ -67,7 +67,7 @@ static ap_other_child_rec_t *other_children = NULL; -API_EXPORT(void) ap_register_other_child(ap_proc_t *pid, +APR_EXPORT(void) ap_register_other_child(ap_proc_t *pid, void (*maintenance) (int reason, void *, int status), void *data, ap_file_t *write_fd, ap_pool_t *p) { @@ -87,7 +87,7 @@ API_EXPORT(void) ap_register_other_child(ap_proc_t *pid, other_children = ocr; } -API_EXPORT(void) ap_unregister_other_child(void *data) +APR_EXPORT(void) ap_unregister_other_child(void *data) { ap_other_child_rec_t **pocr, *nocr; @@ -152,7 +152,7 @@ void ap_probe_writable_fds(void) } } -API_EXPORT(ap_status_t) ap_reap_other_child(ap_proc_t *pid, int status) +APR_EXPORT(ap_status_t) ap_reap_other_child(ap_proc_t *pid, int status) { ap_other_child_rec_t *ocr, *nocr; @@ -168,7 +168,7 @@ API_EXPORT(ap_status_t) ap_reap_other_child(ap_proc_t *pid, int status) return APR_CHILD_NOTDONE; } -API_EXPORT(void) ap_check_other_child(void) +APR_EXPORT(void) ap_check_other_child(void) { ap_other_child_rec_t *ocr, *nocr; pid_t waitret; diff --git a/misc/win32/names.c b/misc/win32/names.c index d831842c9..c6979a199 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. */ -API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pCont, +APR_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pCont, const char *szFile) { char buf[HUGE_STRING_LEN]; diff --git a/test/testthread.c b/test/testthread.c index f82f496ce..eeba90c1b 100644 --- a/test/testthread.c +++ b/test/testthread.c @@ -63,17 +63,17 @@ #endif -void * API_THREAD_FUNC thread_func1(void *data); -void * API_THREAD_FUNC thread_func2(void *data); -void * API_THREAD_FUNC thread_func3(void *data); -void * API_THREAD_FUNC thread_func4(void *data); +void * APR_THREAD_FUNC thread_func1(void *data); +void * APR_THREAD_FUNC thread_func2(void *data); +void * APR_THREAD_FUNC thread_func3(void *data); +void * APR_THREAD_FUNC thread_func4(void *data); ap_lock_t *thread_lock; ap_pool_t *context; int x = 0; -void * API_THREAD_FUNC thread_func1(void *data) +void * APR_THREAD_FUNC thread_func1(void *data) { int i; for (i = 0; i < 10000; i++) { @@ -84,7 +84,7 @@ void * API_THREAD_FUNC thread_func1(void *data) return NULL; } -void * API_THREAD_FUNC thread_func2(void *data) +void * APR_THREAD_FUNC thread_func2(void *data) { int i; for (i = 0; i < 10000; i++) { @@ -95,7 +95,7 @@ void * API_THREAD_FUNC thread_func2(void *data) return NULL; } -void * API_THREAD_FUNC thread_func3(void *data) +void * APR_THREAD_FUNC thread_func3(void *data) { int i; for (i = 0; i < 10000; i++) { @@ -106,7 +106,7 @@ void * API_THREAD_FUNC thread_func3(void *data) return NULL; } -void * API_THREAD_FUNC thread_func4(void *data) +void * APR_THREAD_FUNC thread_func4(void *data) { int i; for (i = 0; i < 10000; i++) { diff --git a/threadproc/win32/thread.c b/threadproc/win32/thread.c index 79a132f90..fcebc75f7 100644 --- a/threadproc/win32/thread.c +++ b/threadproc/win32/thread.c @@ -111,7 +111,7 @@ ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, /* Use 0 for Thread Stack Size, because that will default the stack to the * same size as the calling thread. */ - if (((*new)->td = (HANDLE *)_beginthreadex(NULL, 0, (unsigned int (API_THREAD_FUNC *)(void *))func, + if (((*new)->td = (HANDLE *)_beginthreadex(NULL, 0, (unsigned int (APR_THREAD_FUNC *)(void *))func, data, 0, &temp)) == 0) { lasterror = GetLastError(); return APR_EEXIST; /* MSVC++ doc doesn't mention any additional error info */ diff --git a/time/unix/timestr.c b/time/unix/timestr.c index 889f47997..24f0c7a6b 100644 --- a/time/unix/timestr.c +++ b/time/unix/timestr.c @@ -57,11 +57,11 @@ #include <string.h> -API_VAR_EXPORT const char ap_month_snames[12][4] = +APR_EXPORT_VAR const char ap_month_snames[12][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; -API_VAR_EXPORT const char ap_day_snames[7][4] = +APR_EXPORT_VAR const char ap_day_snames[7][4] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; diff --git a/time/win32/timestr.c b/time/win32/timestr.c index 099fc1448..4a4ca5ba9 100644 --- a/time/win32/timestr.c +++ b/time/win32/timestr.c @@ -55,11 +55,11 @@ #include "atime.h" #include "apr_portable.h" -API_VAR_EXPORT const char ap_month_snames[12][4] = +APR_EXPORT_VAR const char ap_month_snames[12][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; -API_VAR_EXPORT const char ap_day_snames[7][4] = +APR_EXPORT_VAR const char ap_day_snames[7][4] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; |