diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/apr.h.in | 8 | ||||
| -rw-r--r-- | include/apr.hw | 4 | ||||
| -rw-r--r-- | include/apr_compat.h | 37 | ||||
| -rw-r--r-- | include/apr_file_io.h | 8 | ||||
| -rw-r--r-- | include/apr_getopt.h | 10 | ||||
| -rw-r--r-- | include/apr_hash.h | 6 | ||||
| -rw-r--r-- | include/apr_lib.h | 38 | ||||
| -rw-r--r-- | include/apr_md5.h | 27 | ||||
| -rw-r--r-- | include/apr_network_io.h | 10 | ||||
| -rw-r--r-- | include/apr_pools.h | 40 | ||||
| -rw-r--r-- | include/apr_portable.h | 24 | ||||
| -rw-r--r-- | include/apr_tables.h | 12 | ||||
| -rw-r--r-- | include/apr_thread_proc.h | 4 | ||||
| -rw-r--r-- | include/apr_time.h | 28 | ||||
| -rw-r--r-- | include/apr_xlate.h | 46 | ||||
| -rw-r--r-- | include/arch/os2/fileio.h | 3 | ||||
| -rw-r--r-- | include/arch/unix/misc.h | 37 | ||||
| -rw-r--r-- | include/arch/win32/fileio.h | 12 | ||||
| -rw-r--r-- | include/arch/win32/misc.h | 37 |
19 files changed, 218 insertions, 173 deletions
diff --git a/include/apr.h.in b/include/apr.h.in index 8f903fd2a..42e853b9d 100644 --- a/include/apr.h.in +++ b/include/apr.h.in @@ -15,11 +15,11 @@ #if !defined(__GNUC__) || __GNUC__ < 2 || \ (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\ defined(NEXT) -#define ap_inline +#define apr_inline #define __attribute__(__x) #define ENUM_BITFIELD(e,n,w) signed int n : w #else -#define ap_inline __inline__ +#define apr_inline __inline__ #define USE_GNU_INLINE #define ENUM_BITFIELD(e,n,w) e n : w #endif @@ -158,12 +158,12 @@ Sigfunc *apr_signal(int signo, Sigfunc * func); #include <sys/wait.h> #ifdef WEXITSTATUS -#define ap_wait_t int +#define apr_wait_t int #else /* We don't have a POSIX wait interface. Assume we have the old-style. Is this * a bad assumption? */ /* Yessiree bob, it was... but will this work instead? */ -#define ap_wait_t union wait +#define apr_wait_t union wait #define WEXITSTATUS(status) (int)((status).w_retcode) #define WTERMSIG(status) (int)((status).w_termsig) #endif /* !WEXITSTATUS */ diff --git a/include/apr.hw b/include/apr.hw index 1f6f31843..2e151108b 100644 --- a/include/apr.hw +++ b/include/apr.hw @@ -109,7 +109,7 @@ #include <signal.h> #include <stdlib.h> -#define ap_inline +#define apr_inline #define __attribute__(__x) #define ENUM_BITFIELD(e,n,w) signed int n : w @@ -199,7 +199,7 @@ typedef int gid_t; #define apr_signal(a,b) signal(a,b) -typedef int ap_wait_t; +typedef int apr_wait_t; /* struct iovec is needed to emulate Unix writev */ struct iovec { diff --git a/include/apr_compat.h b/include/apr_compat.h index 31a99e466..e291a325f 100644 --- a/include/apr_compat.h +++ b/include/apr_compat.h @@ -3,12 +3,16 @@ /* redefine 1.3.x symbols to those that now live in libapr */ +#define ap_inline apr_inline + +#define ap_md5_ctx_t apr_md5_ctx_t #define ap_MD5Encode apr_MD5Encode #define ap_MD5Final apr_MD5Final #define ap_MD5Init apr_MD5Init #define ap_MD5Update apr_MD5Update #define ap_append_arrays apr_append_arrays #define ap_array_cat apr_array_cat +#define ap_array_header_t apr_array_header_t #define ap_array_pstrcat apr_array_pstrcat #define ap_bytes_in_free_blocks apr_bytes_in_free_blocks #define ap_bytes_in_pool apr_bytes_in_pool @@ -19,20 +23,31 @@ #define ap_copy_array_hdr apr_copy_array_hdr #define ap_copy_table apr_copy_table #define ap_cpystrn apr_cpystrn +#define ap_day_snames apr_day_snames #define ap_destroy_pool apr_destroy_pool +#define ap_exploded_time_t apr_exploded_time_t #define ap_fnmatch apr_fnmatch +#define ap_inet_addr apr_inet_addr #define ap_init_alloc apr_init_alloc +#define ap_is_empty_table apr_is_empty_table #define ap_is_fnmatch apr_is_fnmatch #define ap_kill_cleanup apr_kill_cleanup #define ap_make_array apr_make_array #define ap_make_sub_pool apr_make_sub_pool #define ap_make_table apr_make_table +#define ap_month_snames apr_month_snames #define ap_note_subprocess apr_note_subprocess #define ap_null_cleanup apr_null_cleanup +#define ap_optarg apr_optarg +#define ap_opterr apr_opterr +#define ap_optind apr_optind +#define ap_optopt apr_optopt +#define ap_optreset apr_optreset #define ap_overlap_tables apr_overlap_tables #define ap_overlay_tables apr_overlay_tables #define ap_palloc apr_palloc #define ap_pcalloc apr_pcalloc +#define ap_pool_join apr_pool_join #define ap_psprintf apr_psprintf #define ap_pstrcat apr_pstrcat #define ap_pstrdup apr_pstrdup @@ -47,6 +62,7 @@ #define ap_table_add apr_table_add #define ap_table_addn apr_table_addn #define ap_table_do apr_table_do +#define ap_table_elts apr_table_elts #define ap_table_get apr_table_get #define ap_table_merge apr_table_merge #define ap_table_mergen apr_table_mergen @@ -57,5 +73,26 @@ #define ap_validate_password apr_validate_password #define ap_vformatter apr_vformatter #define ap_vsnprintf apr_vsnprintf +#define ap_wait_t apr_wait_t + +#define ap_isalnum apr_isalnum +#define ap_isalpha apr_isalpha +#define ap_iscntrl apr_iscntrl +#define ap_isdigit apr_isdigit +#define ap_isgraph apr_isgraph +#define ap_islower apr_islower +#define ap_isascii apr_isascii +#define ap_isprint apr_isprint +#define ap_ispunct apr_ispunct +#define ap_isspace apr_isspace +#define ap_isupper apr_isupper +#define ap_isxdigit apr_isxdigit +#define ap_tolower apr_tolower +#define ap_toupper apr_toupper + +#define AP_USEC_PER_SEC APR_USEC_PER_SEC +#define AP_RFC822_DATE_LEN APR_RFC822_DATE_LEN +#define AP_OVERLAP_TABLES_MERGE APR_OVERLAP_TABLES_MERGE +#define AP_OVERLAP_TABLES_SET APR_OVERLAP_TABLES_SET #endif /* APR_COMPAT_H */ diff --git a/include/apr_file_io.h b/include/apr_file_io.h index 984c0ab73..eb31de3a0 100644 --- a/include/apr_file_io.h +++ b/include/apr_file_io.h @@ -71,7 +71,7 @@ extern "C" { */ typedef enum {APR_NOFILE, APR_REG, APR_DIR, APR_CHR, APR_BLK, APR_PIPE, APR_LNK, - APR_SOCK} ap_filetype_e; + APR_SOCK} apr_filetype_e; /* Flags for apr_open */ #define APR_READ 1 /* Open the file for reading */ @@ -129,7 +129,7 @@ struct apr_finfo_t { /** The type of file. One of APR_NOFILE, APR_REG, APR_DIR, APR_CHR, * APR_BLK, APR_PIPE, APR_LNK, APR_SOCK */ - ap_filetype_e filetype; + apr_filetype_e filetype; /** The user id that owns the file */ apr_uid_t user; /** The group id that owns the file */ @@ -261,7 +261,7 @@ apr_status_t apr_write(apr_file_t *thefile, const void *buf, apr_ssize_t *nbytes * @param thefile The file descriptor to write to. * @param vec The array from which to get the data to write to the file. * @param nvec The number of elements in the struct iovec array. This must - * be smaller than AP_MAX_IOVEC_SIZE. If it isn't, the function + * be smaller than APR_MAX_IOVEC_SIZE. If it isn't, the function * will fail with APR_EINVAL. * @param nbytes The number of bytes written. * @tip It is possible for both bytes to be written and an error to be returned. @@ -536,7 +536,7 @@ apr_status_t apr_dir_entry_mtime(apr_time_t *mtime, apr_dir_t *thedir); * @param type the file type of the directory entry. * @param thedir the currently open directory. */ -apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir); +apr_status_t apr_dir_entry_ftype(apr_filetype_e *type, apr_dir_t *thedir); /** * Write a string to a file using a printf format. diff --git a/include/apr_getopt.h b/include/apr_getopt.h index 55266153a..0abb57865 100644 --- a/include/apr_getopt.h +++ b/include/apr_getopt.h @@ -56,12 +56,12 @@ #define APR_GETOPT_H APR_VAR_IMPORT 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 */ + apr_opterr, /* if error message should be printed */ + apr_optind, /* index into parent argv vector */ + apr_optopt, /* character checked for validity */ + apr_optreset; /* reset getopt */ APR_VAR_IMPORT char * - ap_optarg; /* argument associated with option */ + apr_optarg; /* argument associated with option */ /** * Parse the command line options passed to the program. diff --git a/include/apr_hash.h b/include/apr_hash.h index bab59807b..5bb50c0f2 100644 --- a/include/apr_hash.h +++ b/include/apr_hash.h @@ -56,8 +56,8 @@ * University of Illinois, Urbana-Champaign. */ -#ifndef ap_HASH_H -#define ap_HASH_H +#ifndef APR_HASH_H +#define APR_HASH_H #ifdef __cplusplus extern "C" { @@ -164,4 +164,4 @@ APR_EXPORT(void) apr_hash_this(apr_hash_index_t *hi, const void **key, } #endif -#endif /* !ap_HASH_H */ +#endif /* !APR_HASH_H */ diff --git a/include/apr_lib.h b/include/apr_lib.h index 3e4c84bd5..7b5f36214 100644 --- a/include/apr_lib.h +++ b/include/apr_lib.h @@ -114,20 +114,20 @@ APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname); * that's legacy libc for ya. These new macros do not support EOF like * the standard macros do. Tough. */ -#define ap_isalnum(c) (isalnum(((unsigned char)(c)))) -#define ap_isalpha(c) (isalpha(((unsigned char)(c)))) -#define ap_iscntrl(c) (iscntrl(((unsigned char)(c)))) -#define ap_isdigit(c) (isdigit(((unsigned char)(c)))) -#define ap_isgraph(c) (isgraph(((unsigned char)(c)))) -#define ap_islower(c) (islower(((unsigned char)(c)))) -#define ap_isascii(c) (isascii(((unsigned char)(c)))) -#define ap_isprint(c) (isprint(((unsigned char)(c)))) -#define ap_ispunct(c) (ispunct(((unsigned char)(c)))) -#define ap_isspace(c) (isspace(((unsigned char)(c)))) -#define ap_isupper(c) (isupper(((unsigned char)(c)))) -#define ap_isxdigit(c) (isxdigit(((unsigned char)(c)))) -#define ap_tolower(c) (tolower(((unsigned char)(c)))) -#define ap_toupper(c) (toupper(((unsigned char)(c)))) +#define apr_isalnum(c) (isalnum(((unsigned char)(c)))) +#define apr_isalpha(c) (isalpha(((unsigned char)(c)))) +#define apr_iscntrl(c) (iscntrl(((unsigned char)(c)))) +#define apr_isdigit(c) (isdigit(((unsigned char)(c)))) +#define apr_isgraph(c) (isgraph(((unsigned char)(c)))) +#define apr_islower(c) (islower(((unsigned char)(c)))) +#define apr_isascii(c) (isascii(((unsigned char)(c)))) +#define apr_isprint(c) (isprint(((unsigned char)(c)))) +#define apr_ispunct(c) (ispunct(((unsigned char)(c)))) +#define apr_isspace(c) (isspace(((unsigned char)(c)))) +#define apr_isupper(c) (isupper(((unsigned char)(c)))) +#define apr_isxdigit(c) (isxdigit(((unsigned char)(c)))) +#define apr_tolower(c) (tolower(((unsigned char)(c)))) +#define apr_toupper(c) (toupper(((unsigned char)(c)))) /* * Small utility macros to make things easier to read. Not usually a @@ -135,12 +135,12 @@ APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname); */ #ifdef WIN32 -#define ap_killpg(x, y) +#define apr_killpg(x, y) #else /* WIN32 */ #ifdef NO_KILLPG -#define ap_killpg(x, y) (kill (-(x), (y))) +#define apr_killpg(x, y) (kill (-(x), (y))) #else /* NO_KILLPG */ -#define ap_killpg(x, y) (killpg ((x), (y))) +#define apr_killpg(x, y) (killpg ((x), (y))) #endif /* NO_KILLPG */ #endif /* WIN32 */ @@ -166,9 +166,9 @@ APR_EXPORT(const char *) apr_filename_of_pathname(const char *pathname); * for the increased robustness of having printf-warnings work. * * Additionally, apr_vformatter allows for arbitrary output methods - * using the ap_vformatter_buff and flush_func. + * using the apr_vformatter_buff and flush_func. * - * The ap_vformatter_buff has two elements curpos and endpos. + * The apr_vformatter_buff has two elements curpos and endpos. * curpos is where apr_vformatter will write the next byte of output. * It proceeds writing output to curpos, and updating curpos, until * either the end of output is reached, or curpos == endpos (i.e. the diff --git a/include/apr_md5.h b/include/apr_md5.h index d62eb0374..54b48438d 100644 --- a/include/apr_md5.h +++ b/include/apr_md5.h @@ -100,10 +100,10 @@ extern "C" { /* UINT4 defines a four byte word */ typedef unsigned int UINT4; -typedef struct ap_md5_ctx_t ap_md5_ctx_t; +typedef struct apr_md5_ctx_t apr_md5_ctx_t; /** MD5 context. */ -struct ap_md5_ctx_t { +struct apr_md5_ctx_t { /** state (ABCD) */ UINT4 state[4]; /** number of bits, modulo 2^64 (lsb first) */ @@ -119,21 +119,22 @@ struct ap_md5_ctx_t { /** * MD5 Initialize. Begins an MD5 operation, writing a new context. * @param context The MD5 context to initialize. - * @deffunc apr_status_t apr_MD5Init(ap_md5_ctx_t *context) + * @deffunc apr_status_t apr_MD5Init(apr_md5_ctx_t *context) */ -APR_EXPORT(apr_status_t) apr_MD5Init(ap_md5_ctx_t *context); +APR_EXPORT(apr_status_t) apr_MD5Init(apr_md5_ctx_t *context); /** * MD5 translation setup. Provides the APR translation handle to be used * for translating the content before calculating the digest. * @param context The MD5 content to set the translation for. * @param xlate The translation handle to use for this MD5 context - * @deffunc apr_status_t ap_MD5SetXlate(ap_md5_ctx_t *context, apr_xlate_t *xlate) + * @deffunc apr_status_t apr_MD5SetXlate(apr_md5_ctx_t *context, apr_xlate_t *xlate) */ #if APR_HAS_XLATE -APR_EXPORT(apr_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, apr_xlate_t *xlate); +APR_EXPORT(apr_status_t) apr_MD5SetXlate(apr_md5_ctx_t *context, + apr_xlate_t *xlate); #else -#define ap_MD5SetXlate(context, xlate) APR_ENOTIMPL +#define apr_MD5SetXlate(context, xlate) APR_ENOTIMPL #endif /** @@ -142,21 +143,21 @@ APR_EXPORT(apr_status_t) ap_MD5SetXlate(ap_md5_ctx_t *context, apr_xlate_t *xlat * @param context The MD5 content to update. * @param input next message block to update * @param inputLen The length of the next message block - * @deffunc apr_status_t apr_MD5Update(ap_md5_ctx_t *context, const unsigned char *input, unsigned int inputLen) + * @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(ap_md5_ctx_t *context, - const unsigned char *input, - unsigned int inputLen); +APR_EXPORT(apr_status_t) apr_MD5Update(apr_md5_ctx_t *context, + const unsigned char *input, + unsigned int inputLen); /** * MD5 finalization. Ends an MD5 message-digest operation, writing the * message digest and zeroing the context * @param digest The final MD5 digest * @param context The MD5 content we are finalizing. - * @deffunc apr_status_t apr_MD5Final(unsigned char digest[MD5_DIGESTSIZE], ap_md5_ctx_t *context) + * @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], - ap_md5_ctx_t *context); + apr_md5_ctx_t *context); /** * Encode a password using an MD5 algorithm diff --git a/include/apr_network_io.h b/include/apr_network_io.h index 87e9bb377..3055eb712 100644 --- a/include/apr_network_io.h +++ b/include/apr_network_io.h @@ -101,7 +101,7 @@ extern "C" { #define APR_POLLNVAL 0x040 typedef enum {APR_SHUTDOWN_READ, APR_SHUTDOWN_WRITE, - APR_SHUTDOWN_READWRITE} ap_shutdown_how_e; + APR_SHUTDOWN_READWRITE} apr_shutdown_how_e; /* We need to make sure we always have an in_addr type, so APR will just * define it ourselves, if the platform doesn't provide it. @@ -112,14 +112,14 @@ struct in_addr { } #endif -/* I guess not everybody uses inet_addr. This defines ap_inet_addr +/* I guess not everybody uses inet_addr. This defines apr_inet_addr * appropriately. */ #if APR_HAVE_INET_ADDR -#define ap_inet_addr inet_addr +#define apr_inet_addr inet_addr #elif APR_HAVE_INET_NETWORK /* only DGUX, as far as I know */ -#define ap_inet_addr inet_network +#define apr_inet_addr inet_network #endif typedef struct apr_socket_t apr_socket_t; @@ -167,7 +167,7 @@ apr_status_t apr_create_tcp_socket(apr_socket_t **new_sock, apr_pool_t *cont); * @tip This does not actually close the socket descriptor, it just * controls which calls are still valid on the socket. */ -apr_status_t apr_shutdown(apr_socket_t *thesocket, ap_shutdown_how_e how); +apr_status_t apr_shutdown(apr_socket_t *thesocket, apr_shutdown_how_e how); /** * Close a tcp socket. diff --git a/include/apr_pools.h b/include/apr_pools.h index 80a5dc6d9..b368debcb 100644 --- a/include/apr_pools.h +++ b/include/apr_pools.h @@ -52,8 +52,8 @@ * <http://www.apache.org/>. */ -#ifndef ap_POOLS_H -#define ap_POOLS_H +#ifndef APR_POOLS_H +#define APR_POOLS_H #ifdef __cplusplus extern "C" { @@ -140,37 +140,37 @@ struct process_chain { * if the data is allocated in any ancestor of T's pool. This is the * basis on which the POOL_DEBUG code works -- it tests these ancestor * relationships for all data inserted into tables. POOL_DEBUG also - * provides tools (ap_find_pool, and ap_pool_is_ancestor) for other + * provides tools (apr_find_pool, and apr_pool_is_ancestor) for other * folks to implement similar restrictions for their own data * structures. * * However, sometimes this ancestor requirement is inconvenient -- * sometimes we're forced to create a sub pool (such as through - * ap_sub_req_lookup_uri), and the sub pool is guaranteed to have + * apr_sub_req_lookup_uri), and the sub pool is guaranteed to have * the same lifetime as the parent pool. This is a guarantee implemented * by the *caller*, not by the pool code. That is, the caller guarantees * they won't destroy the sub pool individually prior to destroying the * parent pool. * - * In this case the caller must call ap_pool_join() to indicate this + * In this case the caller must call apr_pool_join() to indicate this * guarantee to the POOL_DEBUG code. There are a few examples spread * through the standard modules. */ #ifndef POOL_DEBUG -#ifdef ap_pool_join -#undef ap_pool_join +#ifdef apr_pool_join +#undef apr_pool_join #endif -#define ap_pool_join(a,b) +#define apr_pool_join(a,b) #else -APR_EXPORT(void) ap_pool_join(apr_pool_t *p, apr_pool_t *sub); -APR_EXPORT(apr_pool_t *) ap_find_pool(const void *ts); -APR_EXPORT(int) ap_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b); +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); #endif #ifdef ULTRIX_BRAIN_DEATH -#define ap_fdopen(d,m) fdopen((d), (char *)(m)) +#define apr_fdopen(d,m) fdopen((d), (char *)(m)) #else -#define ap_fdopen(d,m) fdopen((d), (m)) +#define apr_fdopen(d,m) fdopen((d), (m)) #endif /* @@ -241,9 +241,9 @@ APR_EXPORT(apr_size_t) apr_bytes_in_free_blocks(void); * @param b The pool to search for * @return True if a is an ancestor of b, NULL is considered an ancestor * of all pools. - * @deffunc int ap_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b) + * @deffunc int apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b) */ -APR_EXPORT(int) ap_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); /** * Allocate a block of memory from a pool @@ -318,14 +318,14 @@ APR_EXPORT_NONSTD(apr_status_t) apr_null_cleanup(void *data); * destroyed before the parent pool */ #ifndef POOL_DEBUG -#ifdef ap_pool_join -#undef ap_pool_join -#endif /* ap_pool_join */ -#define ap_pool_join(a,b) +#ifdef apr_pool_join +#undef apr_pool_join +#endif /* apr_pool_join */ +#define apr_pool_join(a,b) #endif /* POOL_DEBUG */ #ifdef __cplusplus } #endif -#endif /* !ap_POOLS_H */ +#endif /* !APR_POOLS_H */ diff --git a/include/apr_portable.h b/include/apr_portable.h index 16be3b8f1..bcdd6a0e6 100644 --- a/include/apr_portable.h +++ b/include/apr_portable.h @@ -218,7 +218,8 @@ apr_status_t apr_get_os_lock(apr_os_lock_t *oslock, apr_lock_t *lock); * @param ostime the native time format * @param aprtime the time to convert */ -apr_status_t apr_get_os_exp_time(apr_os_exp_time_t **ostime, ap_exploded_time_t *aprtime); +apr_status_t apr_get_os_exp_time(apr_os_exp_time_t **ostime, + apr_exploded_time_t *aprtime); /** * Get the imploded time in the platforms native format. @@ -252,7 +253,7 @@ apr_status_t apr_get_os_threadkey(apr_os_threadkey_t *thekey, apr_threadkey_t *k * an apr file type. */ apr_status_t apr_put_os_file(apr_file_t **file, apr_os_file_t *thefile, - apr_pool_t *cont); + apr_pool_t *cont); /** * convert the dir from os specific type to apr type. @@ -261,7 +262,7 @@ apr_status_t apr_put_os_file(apr_file_t **file, apr_os_file_t *thefile, * @param cont The pool to use when creating to apr directory. */ apr_status_t apr_put_os_dir(apr_dir_t **dir, apr_os_dir_t *thedir, - apr_pool_t *cont); + apr_pool_t *cont); /** * Convert a socket from the os specific type to the apr type @@ -270,7 +271,7 @@ apr_status_t apr_put_os_dir(apr_dir_t **dir, apr_os_dir_t *thedir, * @param cont The socket we are converting to an apr type. */ apr_status_t apr_put_os_sock(apr_socket_t **sock, apr_os_sock_t *thesock, - apr_pool_t *cont); + apr_pool_t *cont); /** * Convert the lock from os specific type to apr type @@ -279,7 +280,7 @@ apr_status_t apr_put_os_sock(apr_socket_t **sock, apr_os_sock_t *thesock, * @param cont The pool to use if it is needed. */ apr_status_t apr_put_os_lock(apr_lock_t **lock, apr_os_lock_t *thelock, - apr_pool_t *cont); + apr_pool_t *cont); /** * Put the imploded time in the APR format. @@ -287,7 +288,8 @@ apr_status_t apr_put_os_lock(apr_lock_t **lock, apr_os_lock_t *thelock, * @param ostime the time to convert * @param cont the pool to use if necessary */ -apr_status_t apr_put_os_imp_time(apr_time_t *aprtime, apr_os_imp_time_t **ostime, apr_pool_t *cont); +apr_status_t apr_put_os_imp_time(apr_time_t *aprtime, apr_os_imp_time_t **ostime, + apr_pool_t *cont); /** * Put the exploded time in the APR format. @@ -295,7 +297,8 @@ apr_status_t apr_put_os_imp_time(apr_time_t *aprtime, apr_os_imp_time_t **ostime * @param ostime the time to convert * @param cont the pool to use if necessary */ -apr_status_t apr_put_os_exp_time(ap_exploded_time_t *aprtime, apr_os_exp_time_t **ostime, apr_pool_t *cont); +apr_status_t apr_put_os_exp_time(apr_exploded_time_t *aprtime, + apr_os_exp_time_t **ostime, apr_pool_t *cont); #if APR_HAS_THREADS /** @@ -305,7 +308,7 @@ apr_status_t apr_put_os_exp_time(ap_exploded_time_t *aprtime, apr_os_exp_time_t * @param cont The pool to use if it is needed. */ apr_status_t apr_put_os_thread(apr_thread_t **thd, apr_os_thread_t *thethd, - apr_pool_t *cont); + apr_pool_t *cont); /** * convert the thread private memory key from os specific type to apr type. @@ -313,8 +316,9 @@ apr_status_t apr_put_os_thread(apr_thread_t **thd, apr_os_thread_t *thethd, * @param thekey The os specific handle to convert * @param cont The pool to use if it is needed. */ -apr_status_t apr_put_os_threadkey(apr_threadkey_t **key, apr_os_threadkey_t *thekey, - apr_pool_t *cont); +apr_status_t apr_put_os_threadkey(apr_threadkey_t **key, + apr_os_threadkey_t *thekey, + apr_pool_t *cont); #endif #ifdef __cplusplus diff --git a/include/apr_tables.h b/include/apr_tables.h index 43607d5e8..a1c02c641 100644 --- a/include/apr_tables.h +++ b/include/apr_tables.h @@ -132,8 +132,8 @@ struct apr_table_entry_t { * placing it here we are able to get compile-time diagnostics from modules * written which assume that a apr_table_t is the same as an apr_array_header_t. -djg */ -#define ap_table_elts(t) ((apr_array_header_t *)(t)) -#define ap_is_empty_table(t) (((t) == NULL)||(((apr_array_header_t *)(t))->nelts == 0)) +#define apr_table_elts(t) ((apr_array_header_t *)(t)) +#define apr_is_empty_table(t) (((t) == NULL)||(((apr_array_header_t *)(t))->nelts == 0)) APR_EXPORT(apr_array_header_t *) apr_make_array(struct apr_pool_t *p, int nelts, int elt_size); @@ -193,12 +193,12 @@ APR_EXPORT(void) /* Conceptually, apr_overlap_tables does this: - apr_array_header_t *barr = ap_table_elts(b); + apr_array_header_t *barr = apr_table_elts(b); apr_table_entry_t *belt = (apr_table_entry_t *)barr->elts; int i; for (i = 0; i < barr->nelts; ++i) { - if (flags & ap_OVERLAP_TABLES_MERGE) { + if (flags & apr_OVERLAP_TABLES_MERGE) { apr_table_mergen(a, belt[i].key, belt[i].val); } else { @@ -213,8 +213,8 @@ APR_EXPORT(void) in an ancestor of a's pool. In practice b and a are usually from the same pool. */ -#define AP_OVERLAP_TABLES_SET (0) -#define AP_OVERLAP_TABLES_MERGE (1) +#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, unsigned flags); diff --git a/include/apr_thread_proc.h b/include/apr_thread_proc.h index 8cbbf5553..57f847c8e 100644 --- a/include/apr_thread_proc.h +++ b/include/apr_thread_proc.h @@ -416,8 +416,8 @@ apr_status_t apr_wait_proc(apr_proc_t *proc, apr_wait_how_e waithow); * @param p Pool to allocate child information out of. */ -apr_status_t apr_wait_all_procs(apr_proc_t *proc, ap_wait_t *status, - apr_wait_how_e waithow, apr_pool_t *p); +apr_status_t apr_wait_all_procs(apr_proc_t *proc, apr_wait_t *status, + apr_wait_how_e waithow, apr_pool_t *p); /** * Detach the process from the controlling terminal. diff --git a/include/apr_time.h b/include/apr_time.h index 16cf10709..5983c54ef 100644 --- a/include/apr_time.h +++ b/include/apr_time.h @@ -66,8 +66,8 @@ extern "C" { * @package APR Time library */ -APR_VAR_IMPORT const char ap_month_snames[12][4]; -APR_VAR_IMPORT const char ap_day_snames[7][4]; +APR_VAR_IMPORT const char apr_month_snames[12][4]; +APR_VAR_IMPORT const char apr_day_snames[7][4]; /* number of microseconds since 00:00:00 january 1, 1970 UTC */ typedef apr_int64_t apr_time_t; @@ -76,15 +76,15 @@ typedef apr_int64_t apr_time_t; typedef apr_int32_t apr_interval_time_t; #ifdef WIN32 -#define AP_USEC_PER_SEC ((LONGLONG) 1000000) +#define APR_USEC_PER_SEC ((LONGLONG) 1000000) #else /* XXX: this is wrong -- the LL is only required if int64 is implemented as * a long long, it could be just a long on some platforms. the C99 * correct way of doing this is to use INT64_C(1000000) which comes * from stdint.h. we'd probably be doing a Good Thing to check for - * INT64_C in autoconf... or otherwise define an AP_INT64_C(). -dean + * INT64_C in autoconf... or otherwise define an APR_INT64_C(). -dean */ -#define AP_USEC_PER_SEC (1000000LL) +#define APR_USEC_PER_SEC (1000000LL) #endif /** @@ -92,13 +92,13 @@ typedef apr_int32_t apr_interval_time_t; */ apr_time_t apr_now(void); -typedef struct ap_exploded_time_t ap_exploded_time_t; +typedef struct apr_exploded_time_t apr_exploded_time_t; /** * a structure similar to ANSI struct tm with the following differences: * - tm_usec isn't an ANSI field * - tm_gmtoff isn't an ANSI field (it's a bsdism) */ -struct ap_exploded_time_t { +struct apr_exploded_time_t { /** microseconds past tm_sec */ apr_int32_t tm_usec; /** (0-61) seconds past tm_min */ @@ -128,21 +128,21 @@ struct ap_exploded_time_t { * @param result the resulting apr_time_t * @param input the time_t to convert */ -apr_status_t apr_ansi_time_to_ap_time(apr_time_t *result, time_t input); +apr_status_t apr_ansi_time_to_apr_time(apr_time_t *result, time_t input); /** * convert a time to its human readable components in GMT timezone * @param result the exploded time * @param input the time to explode */ -apr_status_t apr_explode_gmt(ap_exploded_time_t *result, apr_time_t input); +apr_status_t apr_explode_gmt(apr_exploded_time_t *result, apr_time_t input); /** * convert a time to its human readable components in local timezone * @param result the exploded time * @param input the time to explode */ -apr_status_t apr_explode_localtime(ap_exploded_time_t *result, apr_time_t input); +apr_status_t apr_explode_localtime(apr_exploded_time_t *result, apr_time_t input); /** * Convert time value from human readable format to number of seconds @@ -150,7 +150,7 @@ apr_status_t apr_explode_localtime(ap_exploded_time_t *result, apr_time_t input) * @param result the resulting imploded time * @param input the input exploded time */ -apr_status_t apr_implode_time(apr_time_t *result, ap_exploded_time_t *input); +apr_status_t apr_implode_time(apr_time_t *result, apr_exploded_time_t *input); /** * Sleep for the specified number of micro-seconds. @@ -159,7 +159,7 @@ apr_status_t apr_implode_time(apr_time_t *result, ap_exploded_time_t *input); */ void apr_sleep(apr_interval_time_t t); -#define AP_RFC822_DATE_LEN (30) +#define APR_RFC822_DATE_LEN (30) /** * apr_rfc822_date formats dates in the RFC822 * format in an efficient manner. it is a fixed length @@ -170,7 +170,7 @@ void apr_sleep(apr_interval_time_t t); */ apr_status_t apr_rfc822_date(char *date_str, apr_time_t t); -#define AP_CTIME_LEN (25) +#define APR_CTIME_LEN (25) /** * apr_ctime formats dates in the ctime() format * in an efficient manner. it is a fixed length format @@ -189,7 +189,7 @@ apr_status_t apr_ctime(char *date_str, apr_time_t t); * @param format The format for the time string * @param tm The time to convert */ -apr_status_t apr_strftime(char *s, apr_size_t *retsize, apr_size_t max, const char *format, ap_exploded_time_t *tm); +apr_status_t apr_strftime(char *s, apr_size_t *retsize, apr_size_t max, const char *format, apr_exploded_time_t *tm); #ifdef __cplusplus } diff --git a/include/apr_xlate.h b/include/apr_xlate.h index ffbbcc9fc..fb5eb14a8 100644 --- a/include/apr_xlate.h +++ b/include/apr_xlate.h @@ -69,9 +69,9 @@ extern "C" { */ /* APR_HAS_XLATE determines whether or not useful implementations of - * ap_xlate_open() et al are provided. + * apr_xlate_open() et al are provided. * - * If APR_HAS_XLATE is zero, ap_xlate_open() et al will all return + * If APR_HAS_XLATE is zero, apr_xlate_open() et al will all return * APR_ENOTIMPL at run-time. */ @@ -83,22 +83,22 @@ typedef void apr_xlate_t; * these are macros which always return failure. */ -#define ap_xlate_open(convset, topage, frompage, pool) APR_ENOTIMPL +#define apr_xlate_open(convset, topage, frompage, pool) APR_ENOTIMPL -#define ap_xlate_get_sb(convset, onoff) APR_ENOTIMPL +#define apr_xlate_get_sb(convset, onoff) APR_ENOTIMPL -#define ap_xlate_conv_buffer(convset, inbuf, inbytes_left, outbuf, \ - outbytes_left) APR_ENOTIMPL +#define apr_xlate_conv_buffer(convset, inbuf, inbytes_left, outbuf, \ + outbytes_left) APR_ENOTIMPL -#define ap_xlate_conv_byte(convset, inchar) (-1) +#define apr_xlate_conv_byte(convset, inchar) (-1) -/* The purpose of ap_xlate_conv_char is to translate one character +/* The purpose of apr_xlate_conv_char is to translate one character * at a time. This needs to be written carefully so that it works * with double-byte character sets. */ -#define ap_xlate_conv_char(convset, inchar, outchar) APR_ENOTIMPL +#define apr_xlate_conv_char(convset, inchar, outchar) APR_ENOTIMPL -#define ap_xlate_close(convset) APR_ENOTIMPL +#define apr_xlate_close(convset) APR_ENOTIMPL #else /* ! APR_HAS_XLATE */ @@ -125,7 +125,7 @@ typedef struct apr_xlate_t apr_xlate_t; * names to indicate the charset of the current locale. * </PRE> */ -apr_status_t ap_xlate_open(apr_xlate_t **convset, const char *topage, +apr_status_t apr_xlate_open(apr_xlate_t **convset, const char *topage, const char *frompage, apr_pool_t *pool); #define APR_DEFAULT_CHARSET (const char *)0 @@ -133,16 +133,16 @@ apr_status_t ap_xlate_open(apr_xlate_t **convset, const char *topage, /** * Find out whether or not the specified conversion is single-byte-only. - * @param convset The handle allocated by ap_xlate_open, specifying the + * @param convset The handle allocated by apr_xlate_open, specifying the * parameters of conversion * @param onoff Output: whether or not the conversion is single-byte-only */ -apr_status_t ap_xlate_get_sb(apr_xlate_t *convset, int *onoff); +apr_status_t apr_xlate_get_sb(apr_xlate_t *convset, int *onoff); /** * Convert a buffer of text from one codepage to another. - * @param convset The handle allocated by ap_xlate_open, specifying + * @param convset The handle allocated by apr_xlate_open, specifying * the parameters of conversion * @param inbuf The address of the source buffer * @param inbytes_left Input: the amount of input data to be translated @@ -151,36 +151,36 @@ apr_status_t ap_xlate_get_sb(apr_xlate_t *convset, int *onoff); * @param outbytes_left Input: the size of the output buffer * Output: the amount of the output buffer not yet used */ -apr_status_t ap_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf, - apr_size_t *inbytes_left, char *outbuf, - apr_size_t *outbytes_left); +apr_status_t apr_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf, + apr_size_t *inbytes_left, char *outbuf, + apr_size_t *outbytes_left); /** - * The purpose of ap_xlate_conv_char is to translate one character + * The purpose of apr_xlate_conv_char is to translate one character * at a time. This needs to be written carefully so that it works * with double-byte character sets. - * @param convset The handle allocated by ap_xlate_open, specifying the + * @param convset The handle allocated by apr_xlate_open, specifying the * parameters of conversion * @param inchar The character to convert * @param outchar The converted character */ -apr_status_t ap_xlate_conv_char(apr_xlate_t *convset, char inchar, char outchar); +apr_status_t apr_xlate_conv_char(apr_xlate_t *convset, char inchar, char outchar); /** * Convert a single-byte character from one charset to another. - * @param convset The handle allocated by ap_xlate_open, specifying the + * @param convset The handle allocated by apr_xlate_open, specifying the * parameters of conversion * @param inchar The single-byte character to convert. * @tip This only works when converting between single-byte character sets. -1 will be returned if the conversion can't be performed. */ -apr_int32_t ap_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar); +apr_int32_t apr_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar); /** * Close a codepage translation handle. * @param convset The codepage translation handle to close */ -apr_status_t ap_xlate_close(apr_xlate_t *convset); +apr_status_t apr_xlate_close(apr_xlate_t *convset); #endif /* ! APR_HAS_XLATE */ diff --git a/include/arch/os2/fileio.h b/include/arch/os2/fileio.h index 6aa1be1c5..5051cacc9 100644 --- a/include/arch/os2/fileio.h +++ b/include/arch/os2/fileio.h @@ -97,7 +97,8 @@ struct apr_dir_t { }; apr_status_t apr_file_cleanup(void *); -apr_status_t ap_os2_time_to_ap_time(apr_time_t *result, FDATE os2date, FTIME os2time); +apr_status_t apr_os2_time_to_apr_time(apr_time_t *result, FDATE os2date, + FTIME os2time); #endif /* ! FILE_IO_H */ diff --git a/include/arch/unix/misc.h b/include/arch/unix/misc.h index f02c112dc..e0ce1d050 100644 --- a/include/arch/unix/misc.h +++ b/include/arch/unix/misc.h @@ -115,7 +115,7 @@ typedef enum { APR_WIN_NT_4_SP4 = 16, APR_WIN_NT_4_SP6 = 18, APR_WIN_2000 = 24 -} ap_oslevel_e; +} apr_oslevel_e; typedef enum { @@ -124,25 +124,26 @@ typedef enum { DLL_WINSOCKAPI = 2, // mswsock From WinSock.h DLL_WINSOCK2API = 3, // ws2_32 From WinSock2.h DLL_defined = 4 // must define as last idx_ + 1 -} ap_dlltoken_e; +} apr_dlltoken_e; -FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char *fnName, int ordinal); +FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal); -/* The ap_load_dll_func call WILL fault if the function cannot be loaded */ +/* The apr_load_dll_func call WILL fault if the function cannot be loaded */ -#define AP_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \ - typedef rettype (calltype *ap_winapi_fpt_##fn) args; \ - static ap_winapi_fpt_##fn ap_winapi_pfn_##fn = NULL; \ - __inline rettype ap_winapi_##fn args \ - { if (!ap_winapi_pfn_##fn) \ - ap_winapi_pfn_##fn = (ap_winapi_fpt_##fn) ap_load_dll_func(lib, #fn, ord); \ - return (*(ap_winapi_pfn_##fn)) names; }; \ +#define APR_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \ + typedef rettype (calltype *apr_winapi_fpt_##fn) args; \ + static apr_winapi_fpt_##fn apr_winapi_pfn_##fn = NULL; \ + __inline rettype apr_winapi_##fn args \ + { if (!apr_winapi_pfn_##fn) \ + apr_winapi_pfn_##fn = (apr_winapi_fpt_##fn) \ + apr_load_dll_func(lib, #fn, ord); \ + return (*(apr_winapi_pfn_##fn)) names; }; \ /* Provide late bound declarations of every API function missing from * one or more supported releases of the Win32 API * - * lib is the enumerated token from ap_dlltoken_e, and must correspond - * to the string table entry in start.c used by the ap_load_dll_func(). + * lib is the enumerated token from apr_dlltoken_e, and must correspond + * to the string table entry in start.c used by the apr_load_dll_func(). * Token names (attempt to) follow Windows.h declarations prefixed by DLL_ * in order to facilitate comparison. Use the exact declaration syntax * and names from Windows.h to prevent ambigutity and bugs. @@ -157,20 +158,20 @@ FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char *fnName, int ordinal); * In the case of non-text functions, simply #define the original name */ -AP_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExA, 0, ( +APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExA, 0, ( IN LPCSTR lpFileName, IN GET_FILEEX_INFO_LEVELS fInfoLevelId, OUT LPVOID lpFileInformation), (lpFileName, fInfoLevelId, lpFileInformation)); #undef GetFileAttributesEx -#define GetFileAttributesEx ap_winapi_GetFileAttributesExA +#define GetFileAttributesEx apr_winapi_GetFileAttributesExA -AP_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, ( +APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, ( IN HANDLE hFile), (hFile)); -#define CancelIo ap_winapi_CancelIo +#define CancelIo apr_winapi_CancelIo -apr_status_t ap_get_oslevel(struct apr_pool_t *, ap_oslevel_e *); +apr_status_t apr_get_oslevel(struct apr_pool_t *, apr_oslevel_e *); #endif /* WIN32 */ #endif /* ! MISC_H */ diff --git a/include/arch/win32/fileio.h b/include/arch/win32/fileio.h index bfdda7421..661154ead 100644 --- a/include/arch/win32/fileio.h +++ b/include/arch/win32/fileio.h @@ -92,7 +92,7 @@ * fname -- the filename as passed to the open call. * dwFileAttricutes -- Attributes used to open the file. * demonfname -- the canonicalized filename. Used to store the result from - * ap_os_canonicalize_filename. + * apr_os_canonicalize_filename. * lowerdemonfname -- inserted at Ken Parzygnat's request, because of the * ugly way windows deals with case in the filesystem. * append -- Windows doesn't support the append concept when opening files. @@ -143,12 +143,12 @@ struct apr_dir_t { apr_status_t file_cleanup(void *); /*mode_t get_fileperms(apr_fileperms_t); */ -APR_EXPORT(char *) ap_os_systemcase_filename(struct apr_pool_t *pCont, - const char *szFile); +APR_EXPORT(char *) apr_os_systemcase_filename(struct apr_pool_t *pCont, + const char *szFile); char * canonical_filename(struct apr_pool_t *pCont, const char *szFile); -apr_status_t ap_create_nt_pipe(apr_file_t **in, apr_file_t **out, - BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite, - apr_pool_t *p); +apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out, + BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite, + apr_pool_t *p); #endif /* ! FILE_IO_H */ diff --git a/include/arch/win32/misc.h b/include/arch/win32/misc.h index f02c112dc..e0ce1d050 100644 --- a/include/arch/win32/misc.h +++ b/include/arch/win32/misc.h @@ -115,7 +115,7 @@ typedef enum { APR_WIN_NT_4_SP4 = 16, APR_WIN_NT_4_SP6 = 18, APR_WIN_2000 = 24 -} ap_oslevel_e; +} apr_oslevel_e; typedef enum { @@ -124,25 +124,26 @@ typedef enum { DLL_WINSOCKAPI = 2, // mswsock From WinSock.h DLL_WINSOCK2API = 3, // ws2_32 From WinSock2.h DLL_defined = 4 // must define as last idx_ + 1 -} ap_dlltoken_e; +} apr_dlltoken_e; -FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char *fnName, int ordinal); +FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal); -/* The ap_load_dll_func call WILL fault if the function cannot be loaded */ +/* The apr_load_dll_func call WILL fault if the function cannot be loaded */ -#define AP_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \ - typedef rettype (calltype *ap_winapi_fpt_##fn) args; \ - static ap_winapi_fpt_##fn ap_winapi_pfn_##fn = NULL; \ - __inline rettype ap_winapi_##fn args \ - { if (!ap_winapi_pfn_##fn) \ - ap_winapi_pfn_##fn = (ap_winapi_fpt_##fn) ap_load_dll_func(lib, #fn, ord); \ - return (*(ap_winapi_pfn_##fn)) names; }; \ +#define APR_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \ + typedef rettype (calltype *apr_winapi_fpt_##fn) args; \ + static apr_winapi_fpt_##fn apr_winapi_pfn_##fn = NULL; \ + __inline rettype apr_winapi_##fn args \ + { if (!apr_winapi_pfn_##fn) \ + apr_winapi_pfn_##fn = (apr_winapi_fpt_##fn) \ + apr_load_dll_func(lib, #fn, ord); \ + return (*(apr_winapi_pfn_##fn)) names; }; \ /* Provide late bound declarations of every API function missing from * one or more supported releases of the Win32 API * - * lib is the enumerated token from ap_dlltoken_e, and must correspond - * to the string table entry in start.c used by the ap_load_dll_func(). + * lib is the enumerated token from apr_dlltoken_e, and must correspond + * to the string table entry in start.c used by the apr_load_dll_func(). * Token names (attempt to) follow Windows.h declarations prefixed by DLL_ * in order to facilitate comparison. Use the exact declaration syntax * and names from Windows.h to prevent ambigutity and bugs. @@ -157,20 +158,20 @@ FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char *fnName, int ordinal); * In the case of non-text functions, simply #define the original name */ -AP_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExA, 0, ( +APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExA, 0, ( IN LPCSTR lpFileName, IN GET_FILEEX_INFO_LEVELS fInfoLevelId, OUT LPVOID lpFileInformation), (lpFileName, fInfoLevelId, lpFileInformation)); #undef GetFileAttributesEx -#define GetFileAttributesEx ap_winapi_GetFileAttributesExA +#define GetFileAttributesEx apr_winapi_GetFileAttributesExA -AP_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, ( +APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, ( IN HANDLE hFile), (hFile)); -#define CancelIo ap_winapi_CancelIo +#define CancelIo apr_winapi_CancelIo -apr_status_t ap_get_oslevel(struct apr_pool_t *, ap_oslevel_e *); +apr_status_t apr_get_oslevel(struct apr_pool_t *, apr_oslevel_e *); #endif /* WIN32 */ #endif /* ! MISC_H */ |