Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 31175 invoked from network); 16 Jul 2009 04:52:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Jul 2009 04:52:27 -0000 Received: (qmail 48809 invoked by uid 500); 16 Jul 2009 04:53:32 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 48751 invoked by uid 500); 16 Jul 2009 04:53:32 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 48742 invoked by uid 99); 16 Jul 2009 04:53:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jul 2009 04:53:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jul 2009 04:53:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 793C92388878; Thu, 16 Jul 2009 04:53:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r794523 [3/3] - in /apr/apr/trunk: buckets/ build/ crypto/ dbd/ dbm/ dbm/sdbm/ docs/ encoding/ hooks/ include/ include/private/ ldap/ memcache/ strmatch/ uri/ util-misc/ xlate/ xml/ Date: Thu, 16 Jul 2009 04:52:58 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090716045302.793C92388878@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: apr/apr/trunk/include/apr_sdbm.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_sdbm.h?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apr_sdbm.h (original) +++ apr/apr/trunk/include/apr_sdbm.h Thu Jul 16 04:52:56 2009 @@ -83,7 +83,7 @@ * @remark The sdbm name is not a true file name, as sdbm appends suffixes * for seperate data and index files. */ -APU_DECLARE(apr_status_t) apr_sdbm_open(apr_sdbm_t **db, const char *name, +APR_DECLARE(apr_status_t) apr_sdbm_open(apr_sdbm_t **db, const char *name, apr_int32_t mode, apr_fileperms_t perms, apr_pool_t *p); @@ -91,7 +91,7 @@ * Close an sdbm file previously opened by apr_sdbm_open * @param db The database to close */ -APU_DECLARE(apr_status_t) apr_sdbm_close(apr_sdbm_t *db); +APR_DECLARE(apr_status_t) apr_sdbm_close(apr_sdbm_t *db); /** * Lock an sdbm database for concurency of multiple operations @@ -108,13 +108,13 @@ * The apr_sdbm_lock call requires the database to be opened with the * APR_SHARELOCK mode value. */ -APU_DECLARE(apr_status_t) apr_sdbm_lock(apr_sdbm_t *db, int type); +APR_DECLARE(apr_status_t) apr_sdbm_lock(apr_sdbm_t *db, int type); /** * Release an sdbm lock previously aquired by apr_sdbm_lock * @param db The database to unlock */ -APU_DECLARE(apr_status_t) apr_sdbm_unlock(apr_sdbm_t *db); +APR_DECLARE(apr_status_t) apr_sdbm_unlock(apr_sdbm_t *db); /** * Fetch an sdbm record value by key @@ -122,7 +122,7 @@ * @param value The value datum retrieved for this record * @param key The key datum to find this record */ -APU_DECLARE(apr_status_t) apr_sdbm_fetch(apr_sdbm_t *db, +APR_DECLARE(apr_status_t) apr_sdbm_fetch(apr_sdbm_t *db, apr_sdbm_datum_t *value, apr_sdbm_datum_t key); @@ -137,7 +137,7 @@ * APR_SDBM_REPLACE overwrite any existing record for key * */ -APU_DECLARE(apr_status_t) apr_sdbm_store(apr_sdbm_t *db, apr_sdbm_datum_t key, +APR_DECLARE(apr_status_t) apr_sdbm_store(apr_sdbm_t *db, apr_sdbm_datum_t key, apr_sdbm_datum_t value, int opt); /** @@ -146,7 +146,7 @@ * @param key The key datum of the record to delete * @remark It is not an error to delete a non-existent record. */ -APU_DECLARE(apr_status_t) apr_sdbm_delete(apr_sdbm_t *db, +APR_DECLARE(apr_status_t) apr_sdbm_delete(apr_sdbm_t *db, const apr_sdbm_datum_t key); /** @@ -158,19 +158,19 @@ * prior to retrieving the first record, and hold the lock until after the * last call to apr_sdbm_nextkey. */ -APU_DECLARE(apr_status_t) apr_sdbm_firstkey(apr_sdbm_t *db, apr_sdbm_datum_t *key); +APR_DECLARE(apr_status_t) apr_sdbm_firstkey(apr_sdbm_t *db, apr_sdbm_datum_t *key); /** * Retrieve the next record key from an sdbm * @param db The database * @param key The key datum of the next record */ -APU_DECLARE(apr_status_t) apr_sdbm_nextkey(apr_sdbm_t *db, apr_sdbm_datum_t *key); +APR_DECLARE(apr_status_t) apr_sdbm_nextkey(apr_sdbm_t *db, apr_sdbm_datum_t *key); /** * Returns true if the sdbm database opened for read-only access * @param db The database to test */ -APU_DECLARE(int) apr_sdbm_rdonly(apr_sdbm_t *db); +APR_DECLARE(int) apr_sdbm_rdonly(apr_sdbm_t *db); /** @} */ #endif /* APR_SDBM_H */ Modified: apr/apr/trunk/include/apr_sha1.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_sha1.h?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apr_sha1.h (original) +++ apr/apr/trunk/include/apr_sha1.h Thu Jul 16 04:52:56 2009 @@ -79,13 +79,13 @@ * will always generate the same hash, making it easier * to break since the search space is smaller. */ -APU_DECLARE(void) apr_sha1_base64(const char *clear, int len, char *out); +APR_DECLARE(void) apr_sha1_base64(const char *clear, int len, char *out); /** * Initialize the SHA digest * @param context The SHA context to initialize */ -APU_DECLARE(void) apr_sha1_init(apr_sha1_ctx_t *context); +APR_DECLARE(void) apr_sha1_init(apr_sha1_ctx_t *context); /** * Update the SHA digest @@ -93,7 +93,7 @@ * @param input The buffer to add to the SHA digest * @param inputLen The length of the input buffer */ -APU_DECLARE(void) apr_sha1_update(apr_sha1_ctx_t *context, const char *input, +APR_DECLARE(void) apr_sha1_update(apr_sha1_ctx_t *context, const char *input, unsigned int inputLen); /** @@ -102,7 +102,7 @@ * @param input The buffer to add to the SHA digest * @param inputLen The length of the input buffer */ -APU_DECLARE(void) apr_sha1_update_binary(apr_sha1_ctx_t *context, +APR_DECLARE(void) apr_sha1_update_binary(apr_sha1_ctx_t *context, const unsigned char *input, unsigned int inputLen); @@ -111,7 +111,7 @@ * @param digest the output buffer in which to store the digest * @param context The context to finalize */ -APU_DECLARE(void) apr_sha1_final(unsigned char digest[APR_SHA1_DIGESTSIZE], +APR_DECLARE(void) apr_sha1_final(unsigned char digest[APR_SHA1_DIGESTSIZE], apr_sha1_ctx_t *context); #ifdef __cplusplus Modified: apr/apr/trunk/include/apr_strmatch.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_strmatch.h?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apr_strmatch.h (original) +++ apr/apr/trunk/include/apr_strmatch.h Thu Jul 16 04:52:56 2009 @@ -58,7 +58,7 @@ * @return A pointer to the first instance of the pattern in s, or * NULL if not found */ -APU_DECLARE(const char *) apr_strmatch(const apr_strmatch_pattern *pattern, +APR_DECLARE(const char *) apr_strmatch(const apr_strmatch_pattern *pattern, const char *s, apr_size_t slen); #else #define apr_strmatch(pattern, s, slen) (*((pattern)->compare))((pattern), (s), (slen)) @@ -71,7 +71,7 @@ * @param case_sensitive Whether the matching should be case-sensitive * @return a pointer to the compiled pattern, or NULL if compilation fails */ -APU_DECLARE(const apr_strmatch_pattern *) apr_strmatch_precompile(apr_pool_t *p, const char *s, int case_sensitive); +APR_DECLARE(const apr_strmatch_pattern *) apr_strmatch_precompile(apr_pool_t *p, const char *s, int case_sensitive); /** @} */ #ifdef __cplusplus Modified: apr/apr/trunk/include/apr_thread_pool.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_thread_pool.h?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apr_thread_pool.h (original) +++ apr/apr/trunk/include/apr_thread_pool.h Thu Jul 16 04:52:56 2009 @@ -74,7 +74,7 @@ * @return APR_SUCCESS if the thread pool was created successfully. Otherwise, * the error code. */ -APU_DECLARE(apr_status_t) apr_thread_pool_create(apr_thread_pool_t **me, +APR_DECLARE(apr_status_t) apr_thread_pool_create(apr_thread_pool_t **me, apr_size_t init_threads, apr_size_t max_threads, apr_pool_t *pool); @@ -83,7 +83,7 @@ * Destroy the thread pool and stop all the threads * @return APR_SUCCESS if all threads are stopped. */ -APU_DECLARE(apr_status_t) apr_thread_pool_destroy(apr_thread_pool_t *me); +APR_DECLARE(apr_status_t) apr_thread_pool_destroy(apr_thread_pool_t *me); /** * Schedule a task to the bottom of the tasks of same priority. @@ -94,7 +94,7 @@ * @param owner Owner of this task. * @return APR_SUCCESS if the task had been scheduled successfully */ -APU_DECLARE(apr_status_t) apr_thread_pool_push(apr_thread_pool_t *me, +APR_DECLARE(apr_status_t) apr_thread_pool_push(apr_thread_pool_t *me, apr_thread_start_t func, void *param, apr_byte_t priority, @@ -108,7 +108,7 @@ * @param owner Owner of this task. * @return APR_SUCCESS if the task had been scheduled successfully */ -APU_DECLARE(apr_status_t) apr_thread_pool_schedule(apr_thread_pool_t *me, +APR_DECLARE(apr_status_t) apr_thread_pool_schedule(apr_thread_pool_t *me, apr_thread_start_t func, void *param, apr_interval_time_t time, @@ -123,7 +123,7 @@ * @param owner Owner of this task. * @return APR_SUCCESS if the task had been scheduled successfully */ -APU_DECLARE(apr_status_t) apr_thread_pool_top(apr_thread_pool_t *me, +APR_DECLARE(apr_status_t) apr_thread_pool_top(apr_thread_pool_t *me, apr_thread_start_t func, void *param, apr_byte_t priority, @@ -138,7 +138,7 @@ * @note The task function should not be calling cancel, otherwise the function * may get stuck forever. The function assert if it detect such a case. */ -APU_DECLARE(apr_status_t) apr_thread_pool_tasks_cancel(apr_thread_pool_t *me, +APR_DECLARE(apr_status_t) apr_thread_pool_tasks_cancel(apr_thread_pool_t *me, void *owner); /** @@ -146,35 +146,35 @@ * @param me The thread pool * @return Number of tasks in the queue */ -APU_DECLARE(apr_size_t) apr_thread_pool_tasks_count(apr_thread_pool_t *me); +APR_DECLARE(apr_size_t) apr_thread_pool_tasks_count(apr_thread_pool_t *me); /** * Get the current number of scheduled tasks waiting in the queue * @param me The thread pool * @return Number of scheduled tasks in the queue */ -APU_DECLARE(apr_size_t) apr_thread_pool_scheduled_tasks_count(apr_thread_pool_t *me); +APR_DECLARE(apr_size_t) apr_thread_pool_scheduled_tasks_count(apr_thread_pool_t *me); /** * Get the current number of threads * @param me The thread pool * @return Total number of threads */ -APU_DECLARE(apr_size_t) apr_thread_pool_threads_count(apr_thread_pool_t *me); +APR_DECLARE(apr_size_t) apr_thread_pool_threads_count(apr_thread_pool_t *me); /** * Get the current number of busy threads * @param me The thread pool * @return Number of busy threads */ -APU_DECLARE(apr_size_t) apr_thread_pool_busy_count(apr_thread_pool_t *me); +APR_DECLARE(apr_size_t) apr_thread_pool_busy_count(apr_thread_pool_t *me); /** * Get the current number of idle threads * @param me The thread pool * @return Number of idle threads */ -APU_DECLARE(apr_size_t) apr_thread_pool_idle_count(apr_thread_pool_t *me); +APR_DECLARE(apr_size_t) apr_thread_pool_idle_count(apr_thread_pool_t *me); /** * Access function for the maximum number of idle threads. Number of current @@ -183,7 +183,7 @@ * @param cnt The number * @return The number of threads that were stopped. */ -APU_DECLARE(apr_size_t) apr_thread_pool_idle_max_set(apr_thread_pool_t *me, +APR_DECLARE(apr_size_t) apr_thread_pool_idle_max_set(apr_thread_pool_t *me, apr_size_t cnt); /** @@ -191,7 +191,7 @@ * @param me The thread pool * @return Number of tasks that have run */ -APU_DECLARE(apr_size_t) +APR_DECLARE(apr_size_t) apr_thread_pool_tasks_run_count(apr_thread_pool_t * me); /** @@ -199,7 +199,7 @@ * @param me The thread pool * @return High water mark of tasks waiting to run */ -APU_DECLARE(apr_size_t) +APR_DECLARE(apr_size_t) apr_thread_pool_tasks_high_count(apr_thread_pool_t * me); /** @@ -207,7 +207,7 @@ * @param me The thread pool * @return High water mark of threads in thread pool */ -APU_DECLARE(apr_size_t) +APR_DECLARE(apr_size_t) apr_thread_pool_threads_high_count(apr_thread_pool_t * me); /** @@ -215,7 +215,7 @@ * @param me The thread pool * @return Number of idle threads that timed out */ -APU_DECLARE(apr_size_t) +APR_DECLARE(apr_size_t) apr_thread_pool_threads_idle_timeout_count(apr_thread_pool_t * me); /** @@ -223,7 +223,7 @@ * @param me The thread pool * @return The current maximum number */ -APU_DECLARE(apr_size_t) apr_thread_pool_idle_max_get(apr_thread_pool_t *me); +APR_DECLARE(apr_size_t) apr_thread_pool_idle_max_get(apr_thread_pool_t *me); /** * Access function for the maximum number of threads. @@ -231,7 +231,7 @@ * @param cnt Number of threads * @return The original maximum number of threads */ -APU_DECLARE(apr_size_t) apr_thread_pool_thread_max_set(apr_thread_pool_t *me, +APR_DECLARE(apr_size_t) apr_thread_pool_thread_max_set(apr_thread_pool_t *me, apr_size_t cnt); /** @@ -244,7 +244,7 @@ * till it reaps itself * @return The original maximum wait time */ -APU_DECLARE(apr_interval_time_t) +APR_DECLARE(apr_interval_time_t) apr_thread_pool_idle_wait_set(apr_thread_pool_t * me, apr_interval_time_t timeout); @@ -254,7 +254,7 @@ * @param me The thread pool * @return The current maximum wait time */ -APU_DECLARE(apr_interval_time_t) +APR_DECLARE(apr_interval_time_t) apr_thread_pool_idle_wait_get(apr_thread_pool_t * me); /** @@ -262,7 +262,7 @@ * @param me The thread pool * @return The current maximum number */ -APU_DECLARE(apr_size_t) apr_thread_pool_thread_max_get(apr_thread_pool_t *me); +APR_DECLARE(apr_size_t) apr_thread_pool_thread_max_get(apr_thread_pool_t *me); /** * Access function for the threshold of tasks in queue to trigger a new thread. @@ -270,7 +270,7 @@ * @param cnt The new threshold * @return The original threshold */ -APU_DECLARE(apr_size_t) apr_thread_pool_threshold_set(apr_thread_pool_t *me, +APR_DECLARE(apr_size_t) apr_thread_pool_threshold_set(apr_thread_pool_t *me, apr_size_t val); /** @@ -278,7 +278,7 @@ * @param me The thread pool * @return The current threshold */ -APU_DECLARE(apr_size_t) apr_thread_pool_threshold_get(apr_thread_pool_t * me); +APR_DECLARE(apr_size_t) apr_thread_pool_threshold_get(apr_thread_pool_t * me); /** * Get owner of the task currently been executed by the thread. @@ -286,7 +286,7 @@ * @param owner Pointer to receive owner of the task. * @return APR_SUCCESS if the owner is retrieved successfully */ -APU_DECLARE(apr_status_t) apr_thread_pool_task_owner_get(apr_thread_t *thd, +APR_DECLARE(apr_status_t) apr_thread_pool_task_owner_get(apr_thread_t *thd, void **owner); /** @} */ Modified: apr/apr/trunk/include/apr_uri.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_uri.h?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apr_uri.h (original) +++ apr/apr/trunk/include/apr_uri.h Thu Jul 16 04:52:56 2009 @@ -124,7 +124,7 @@ * @param scheme_str The string that contains the current scheme * @return The default port for this scheme */ -APU_DECLARE(apr_port_t) apr_uri_port_of_scheme(const char *scheme_str); +APR_DECLARE(apr_port_t) apr_uri_port_of_scheme(const char *scheme_str); /** * Unparse a apr_uri_t structure to an URI string. Optionally @@ -143,7 +143,7 @@ * * @return The uri as a string */ -APU_DECLARE(char *) apr_uri_unparse(apr_pool_t *p, +APR_DECLARE(char *) apr_uri_unparse(apr_pool_t *p, const apr_uri_t *uptr, unsigned flags); @@ -156,7 +156,7 @@ * @param uptr The apr_uri_t to fill out * @return APR_SUCCESS for success or error code */ -APU_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, +APR_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, apr_uri_t *uptr); /** @@ -166,7 +166,7 @@ * @param uptr The apr_uri_t to fill out * @return APR_SUCCESS for success or error code */ -APU_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, +APR_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, const char *hostinfo, apr_uri_t *uptr); Modified: apr/apr/trunk/include/apr_uuid.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_uuid.h?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apr_uuid.h (original) +++ apr/apr/trunk/include/apr_uuid.h Thu Jul 16 04:52:56 2009 @@ -50,7 +50,7 @@ * Generate and return a (new) UUID * @param uuid The resulting UUID */ -APU_DECLARE(void) apr_uuid_get(apr_uuid_t *uuid); +APR_DECLARE(void) apr_uuid_get(apr_uuid_t *uuid); /** * Format a UUID into a string, following the standard format @@ -59,14 +59,14 @@ * the formatted UUID and a null terminator * @param uuid The UUID to format */ -APU_DECLARE(void) apr_uuid_format(char *buffer, const apr_uuid_t *uuid); +APR_DECLARE(void) apr_uuid_format(char *buffer, const apr_uuid_t *uuid); /** * Parse a standard-format string into a UUID * @param uuid The resulting UUID * @param uuid_str The formatted UUID */ -APU_DECLARE(apr_status_t) apr_uuid_parse(apr_uuid_t *uuid, const char *uuid_str); +APR_DECLARE(apr_status_t) apr_uuid_parse(apr_uuid_t *uuid, const char *uuid_str); /** @} */ #ifdef __cplusplus Modified: apr/apr/trunk/include/apr_xlate.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_xlate.h?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apr_xlate.h (original) +++ apr/apr/trunk/include/apr_xlate.h Thu Jul 16 04:52:56 2009 @@ -63,7 +63,7 @@ * if charset transcoding is not available in this instance of * apr-util at all (i.e., APR_HAS_XLATE is undefined). */ -APU_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset, +APR_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset, const char *topage, const char *frompage, apr_pool_t *pool); @@ -90,7 +90,7 @@ * Return APR_ENOTIMPL if charset transcoding is not available * in this instance of apr-util (i.e., APR_HAS_XLATE is undefined). */ -APU_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff); +APR_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff); /** * Convert a buffer of text from one codepage to another. @@ -114,7 +114,7 @@ * the inbuf and inbytes_left parameters as NULL. (Note that this * mode only works from version 1.1.0 onwards) */ -APU_DECLARE(apr_status_t) apr_xlate_conv_buffer(apr_xlate_t *convset, +APR_DECLARE(apr_status_t) apr_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf, apr_size_t *inbytes_left, char *outbuf, @@ -131,7 +131,7 @@ * @param inchar The character to convert * @param outchar The converted character */ -APU_DECLARE(apr_status_t) apr_xlate_conv_char(apr_xlate_t *convset, +APR_DECLARE(apr_status_t) apr_xlate_conv_char(apr_xlate_t *convset, char inchar, char outchar); #endif @@ -143,7 +143,7 @@ * @warning This only works when converting between single-byte character sets. * -1 will be returned if the conversion can't be performed. */ -APU_DECLARE(apr_int32_t) apr_xlate_conv_byte(apr_xlate_t *convset, +APR_DECLARE(apr_int32_t) apr_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar); /** @@ -153,7 +153,7 @@ * Return APR_ENOTIMPL if charset transcoding is not available * in this instance of apr-util (i.e., APR_HAS_XLATE is undefined). */ -APU_DECLARE(apr_status_t) apr_xlate_close(apr_xlate_t *convset); +APR_DECLARE(apr_status_t) apr_xlate_close(apr_xlate_t *convset); /** @} */ #ifdef __cplusplus Modified: apr/apr/trunk/include/apr_xml.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_xml.h?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apr_xml.h (original) +++ apr/apr/trunk/include/apr_xml.h Thu Jul 16 04:52:56 2009 @@ -74,7 +74,7 @@ * @param hdr The text header to append to * @param text The new text to append */ -APU_DECLARE(void) apr_text_append(apr_pool_t *p, apr_text_header *hdr, +APR_DECLARE(void) apr_text_append(apr_pool_t *p, apr_text_header *hdr, const char *text); @@ -212,7 +212,7 @@ * @param pool The pool for allocating the parser and the parse results. * @return The new parser. */ -APU_DECLARE(apr_xml_parser *) apr_xml_parser_create(apr_pool_t *pool); +APR_DECLARE(apr_xml_parser *) apr_xml_parser_create(apr_pool_t *pool); /** * Parse a File, producing a xml_doc @@ -224,7 +224,7 @@ * @param buffer_length Buffer length which would be suitable * @return Any errors found during parsing. */ -APU_DECLARE(apr_status_t) apr_xml_parse_file(apr_pool_t *p, +APR_DECLARE(apr_status_t) apr_xml_parse_file(apr_pool_t *p, apr_xml_parser **parser, apr_xml_doc **ppdoc, apr_file_t *xmlfd, @@ -239,7 +239,7 @@ * @return Any errors found during parsing. * @remark Use apr_xml_parser_geterror() to get more error information. */ -APU_DECLARE(apr_status_t) apr_xml_parser_feed(apr_xml_parser *parser, +APR_DECLARE(apr_status_t) apr_xml_parser_feed(apr_xml_parser *parser, const char *data, apr_size_t len); @@ -251,7 +251,7 @@ * @return Any errors found during the final stage of parsing. * @remark Use apr_xml_parser_geterror() to get more error information. */ -APU_DECLARE(apr_status_t) apr_xml_parser_done(apr_xml_parser *parser, +APR_DECLARE(apr_status_t) apr_xml_parser_done(apr_xml_parser *parser, apr_xml_doc **pdoc); /** @@ -261,7 +261,7 @@ * @param errbufsize The length of the error text buffer. * @return The error buffer */ -APU_DECLARE(char *) apr_xml_parser_geterror(apr_xml_parser *parser, +APR_DECLARE(char *) apr_xml_parser_geterror(apr_xml_parser *parser, char *errbuf, apr_size_t errbufsize); @@ -282,7 +282,7 @@ * @param pbuf Buffer to put the converted text into * @param psize Size of the converted text */ -APU_DECLARE(void) apr_xml_to_text(apr_pool_t *p, const apr_xml_elem *elem, +APR_DECLARE(void) apr_xml_to_text(apr_pool_t *p, const apr_xml_elem *elem, int style, apr_array_header_t *namespaces, int *ns_map, const char **pbuf, apr_size_t *psize); @@ -299,7 +299,7 @@ * @param elem The XML element to empty * @return the string that was stored in the XML element */ -APU_DECLARE(const char *) apr_xml_empty_elem(apr_pool_t *p, +APR_DECLARE(const char *) apr_xml_empty_elem(apr_pool_t *p, const apr_xml_elem *elem); /** @@ -312,7 +312,7 @@ * @note If the string does not contain special characters, it is not * duplicated into the pool and the original string is returned. */ -APU_DECLARE(const char *) apr_xml_quote_string(apr_pool_t *p, const char *s, +APR_DECLARE(const char *) apr_xml_quote_string(apr_pool_t *p, const char *s, int quotes); /** @@ -320,7 +320,7 @@ * @param p The pool to allocate out of * @param elem The element to quote */ -APU_DECLARE(void) apr_xml_quote_elem(apr_pool_t *p, apr_xml_elem *elem); +APR_DECLARE(void) apr_xml_quote_elem(apr_pool_t *p, apr_xml_elem *elem); /* manage an array of unique URIs: apr_xml_insert_uri() and APR_XML_URI_ITEM() */ @@ -330,7 +330,7 @@ * @param uri The uri to insert * @return int The uri's index */ -APU_DECLARE(int) apr_xml_insert_uri(apr_array_header_t *uri_array, +APR_DECLARE(int) apr_xml_insert_uri(apr_array_header_t *uri_array, const char *uri); /** Get the URI item for this XML element */ @@ -344,7 +344,7 @@ * @param xlate The translation handle to use. * @return Any errors found during conversion. */ -APU_DECLARE(apr_status_t) apr_xml_parser_convert_doc(apr_pool_t *p, +APR_DECLARE(apr_status_t) apr_xml_parser_convert_doc(apr_pool_t *p, apr_xml_doc *pdoc, apr_xlate_t *convset); #endif Modified: apr/apr/trunk/include/apu.h.in URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apu.h.in?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apu.h.in (original) +++ apr/apr/trunk/include/apu.h.in Thu Jul 16 04:52:56 2009 @@ -30,42 +30,42 @@ #define APU_H /** - * APU_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library, + * APR_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library, * so that all public symbols are exported. * - * APU_DECLARE_STATIC is defined when including the APR-UTIL public headers, + * APR_DECLARE_STATIC is defined when including the APR-UTIL public headers, * to provide static linkage when the dynamic library may be unavailable. * - * APU_DECLARE_STATIC and APU_DECLARE_EXPORT are left undefined when + * APR_DECLARE_STATIC and APR_DECLARE_EXPORT are left undefined when * including the APR-UTIL public headers, to import and link the symbols from * the dynamic APR-UTIL library and assure appropriate indirection and calling * conventions at compile time. */ /** - * The public APR-UTIL functions are declared with APU_DECLARE(), so they may + * The public APR-UTIL functions are declared with APR_DECLARE(), so they may * use the most appropriate calling convention. Public APR functions with - * variable arguments must use APU_DECLARE_NONSTD(). + * variable arguments must use APR_DECLARE_NONSTD(). * - * @fn APU_DECLARE(rettype) apr_func(args); + * @fn APR_DECLARE(rettype) apr_func(args); */ -#define APU_DECLARE(type) type +#define APR_DECLARE(type) type /** * The public APR-UTIL functions using variable arguments are declared with - * APU_DECLARE_NONSTD(), as they must use the C language calling convention. + * APR_DECLARE_NONSTD(), as they must use the C language calling convention. * - * @fn APU_DECLARE_NONSTD(rettype) apr_func(args, ...); + * @fn APR_DECLARE_NONSTD(rettype) apr_func(args, ...); */ -#define APU_DECLARE_NONSTD(type) type +#define APR_DECLARE_NONSTD(type) type /** - * The public APR-UTIL variables are declared with APU_DECLARE_DATA. + * The public APR-UTIL variables are declared with APR_DECLARE_DATA. * This assures the appropriate indirection is invoked at compile time. * - * @fn APU_DECLARE_DATA type apr_variable; - * @note APU_DECLARE_DATA extern type apr_variable; syntax is required for + * @fn APR_DECLARE_DATA type apr_variable; + * @note APR_DECLARE_DATA extern type apr_variable; syntax is required for * declarations within headers to properly import the variable. */ -#define APU_DECLARE_DATA +#define APR_DECLARE_DATA #if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC) /** Modified: apr/apr/trunk/include/apu.hnw URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apu.hnw?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apu.hnw (original) +++ apr/apr/trunk/include/apu.hnw Thu Jul 16 04:52:56 2009 @@ -32,42 +32,42 @@ /** - * APU_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library, + * APR_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library, * so that all public symbols are exported. * - * APU_DECLARE_STATIC is defined when including the APR-UTIL public headers, + * APR_DECLARE_STATIC is defined when including the APR-UTIL public headers, * to provide static linkage when the dynamic library may be unavailable. * - * APU_DECLARE_STATIC and APU_DECLARE_EXPORT are left undefined when + * APR_DECLARE_STATIC and APR_DECLARE_EXPORT are left undefined when * including the APR-UTIL public headers, to import and link the symbols from * the dynamic APR-UTIL library and assure appropriate indirection and calling * conventions at compile time. */ /** - * The public APR-UTIL functions are declared with APU_DECLARE(), so they may + * The public APR-UTIL functions are declared with APR_DECLARE(), so they may * use the most appropriate calling convention. Public APR functions with - * variable arguments must use APU_DECLARE_NONSTD(). + * variable arguments must use APR_DECLARE_NONSTD(). * - * @fn APU_DECLARE(rettype) apr_func(args); + * @fn APR_DECLARE(rettype) apr_func(args); */ -#define APU_DECLARE(type) type +#define APR_DECLARE(type) type /** * The public APR-UTIL functions using variable arguments are declared with - * APU_DECLARE_NONSTD(), as they must use the C language calling convention. + * APR_DECLARE_NONSTD(), as they must use the C language calling convention. * - * @fn APU_DECLARE_NONSTD(rettype) apr_func(args, ...); + * @fn APR_DECLARE_NONSTD(rettype) apr_func(args, ...); */ -#define APU_DECLARE_NONSTD(type) type +#define APR_DECLARE_NONSTD(type) type /** - * The public APR-UTIL variables are declared with APU_DECLARE_DATA. + * The public APR-UTIL variables are declared with APR_DECLARE_DATA. * This assures the appropriate indirection is invoked at compile time. * - * @fn APU_DECLARE_DATA type apr_variable; - * @note APU_DECLARE_DATA extern type apr_variable; syntax is required for + * @fn APR_DECLARE_DATA type apr_variable; + * @note APR_DECLARE_DATA extern type apr_variable; syntax is required for * declarations within headers to properly import the variable. */ -#define APU_DECLARE_DATA +#define APR_DECLARE_DATA /** * Declare a dso module's exported module structure as APU_MODULE_DECLARE_DATA. Modified: apr/apr/trunk/include/apu.hw URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apu.hw?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apu.hw (original) +++ apr/apr/trunk/include/apu.hw Thu Jul 16 04:52:56 2009 @@ -30,13 +30,13 @@ #define APU_H /** - * APU_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library, + * APR_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library, * so that all public symbols are exported. * - * APU_DECLARE_STATIC is defined when including the APR-UTIL public headers, + * APR_DECLARE_STATIC is defined when including the APR-UTIL public headers, * to provide static linkage when the dynamic library may be unavailable. * - * APU_DECLARE_STATIC and APU_DECLARE_EXPORT are left undefined when + * APR_DECLARE_STATIC and APR_DECLARE_EXPORT are left undefined when * including the APR-UTIL public headers, to import and link the symbols from * the dynamic APR-UTIL library and assure appropriate indirection and calling * conventions at compile time. @@ -44,41 +44,41 @@ #if defined(DOXYGEN) || !defined(WIN32) /** - * The public APR-UTIL functions are declared with APU_DECLARE(), so they may + * The public APR-UTIL functions are declared with APR_DECLARE(), so they may * use the most appropriate calling convention. Public APR functions with - * variable arguments must use APU_DECLARE_NONSTD(). + * variable arguments must use APR_DECLARE_NONSTD(). * - * @fn APU_DECLARE(rettype) apr_func(args); + * @fn APR_DECLARE(rettype) apr_func(args); */ -#define APU_DECLARE(type) type +#define APR_DECLARE(type) type /** * The public APR-UTIL functions using variable arguments are declared with - * APU_DECLARE_NONSTD(), as they must use the C language calling convention. + * APR_DECLARE_NONSTD(), as they must use the C language calling convention. * - * @fn APU_DECLARE_NONSTD(rettype) apr_func(args, ...); + * @fn APR_DECLARE_NONSTD(rettype) apr_func(args, ...); */ -#define APU_DECLARE_NONSTD(type) type +#define APR_DECLARE_NONSTD(type) type /** - * The public APR-UTIL variables are declared with APU_DECLARE_DATA. + * The public APR-UTIL variables are declared with APR_DECLARE_DATA. * This assures the appropriate indirection is invoked at compile time. * - * @fn APU_DECLARE_DATA type apr_variable; - * @note extern APU_DECLARE_DATA type apr_variable; syntax is required for + * @fn APR_DECLARE_DATA type apr_variable; + * @note extern APR_DECLARE_DATA type apr_variable; syntax is required for * declarations within headers to properly import the variable. */ -#define APU_DECLARE_DATA -#elif defined(APU_DECLARE_STATIC) -#define APU_DECLARE(type) type __stdcall -#define APU_DECLARE_NONSTD(type) type __cdecl -#define APU_DECLARE_DATA -#elif defined(APU_DECLARE_EXPORT) -#define APU_DECLARE(type) __declspec(dllexport) type __stdcall -#define APU_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl -#define APU_DECLARE_DATA __declspec(dllexport) +#define APR_DECLARE_DATA +#elif defined(APR_DECLARE_STATIC) +#define APR_DECLARE(type) type __stdcall +#define APR_DECLARE_NONSTD(type) type __cdecl +#define APR_DECLARE_DATA +#elif defined(APR_DECLARE_EXPORT) +#define APR_DECLARE(type) __declspec(dllexport) type __stdcall +#define APR_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl +#define APR_DECLARE_DATA __declspec(dllexport) #else -#define APU_DECLARE(type) __declspec(dllimport) type __stdcall -#define APU_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl -#define APU_DECLARE_DATA __declspec(dllimport) +#define APR_DECLARE(type) __declspec(dllimport) type __stdcall +#define APR_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl +#define APR_DECLARE_DATA __declspec(dllimport) #endif #if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC) Modified: apr/apr/trunk/include/apu_version.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apu_version.h?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/apu_version.h (original) +++ apr/apr/trunk/include/apu_version.h Thu Jul 16 04:52:56 2009 @@ -120,10 +120,10 @@ * @param pvsn Pointer to a version structure for returning the version * information. */ -APU_DECLARE(void) apu_version(apr_version_t *pvsn); +APR_DECLARE(void) apu_version(apr_version_t *pvsn); /** Return APU's version information as a string. */ -APU_DECLARE(const char *) apu_version_string(void); +APR_DECLARE(const char *) apu_version_string(void); #ifdef __cplusplus } Modified: apr/apr/trunk/include/private/apr_dbd_internal.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/private/apr_dbd_internal.h?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/private/apr_dbd_internal.h (original) +++ apr/apr/trunk/include/private/apr_dbd_internal.h Thu Jul 16 04:52:56 2009 @@ -355,8 +355,8 @@ * deprecated; create a per-dbd mutex within the (*init) function * to avoid blocking other providers running on other threads */ -APU_DECLARE(apr_status_t) apr_dbd_mutex_lock(void); -APU_DECLARE(apr_status_t) apr_dbd_mutex_unlock(void); +APR_DECLARE(apr_status_t) apr_dbd_mutex_lock(void); +APR_DECLARE(apr_status_t) apr_dbd_mutex_unlock(void); #ifdef __cplusplus } Modified: apr/apr/trunk/include/private/apr_dbm_private.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/private/apr_dbm_private.h?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/private/apr_dbm_private.h (original) +++ apr/apr/trunk/include/private/apr_dbm_private.h Thu Jul 16 04:52:56 2009 @@ -39,7 +39,7 @@ * Most DBM libraries take a POSIX mode for creating files. Don't trust * the mode_t type, some platforms may not support it, int is safe. */ -APU_DECLARE(int) apr_posix_perms2mode(apr_fileperms_t perm); +APR_DECLARE(int) apr_posix_perms2mode(apr_fileperms_t perm); /** * Structure to describe the operations of the DBM Modified: apr/apr/trunk/include/private/apu_config.hw URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/private/apu_config.hw?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/include/private/apu_config.hw (original) +++ apr/apr/trunk/include/private/apu_config.hw Thu Jul 16 04:52:56 2009 @@ -25,7 +25,7 @@ #define APU_CONFIG_H /* Compile win32 with DSO support for .dll builds */ -#ifdef APU_DECLARE_STATIC +#ifdef APR_DECLARE_STATIC #define APU_DSO_BUILD 0 #else #define APU_DSO_BUILD 1 Modified: apr/apr/trunk/ldap/apr_ldap_init.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_init.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/ldap/apr_ldap_init.c (original) +++ apr/apr/trunk/ldap/apr_ldap_init.c Thu Jul 16 04:52:56 2009 @@ -56,7 +56,7 @@ * will return APR_EGENERAL. Further LDAP specific error information * can be found in result_err. */ -APU_DECLARE_LDAP(int) apr_ldap_ssl_init(apr_pool_t *pool, +APR_DECLARE_LDAP(int) apr_ldap_ssl_init(apr_pool_t *pool, const char *cert_auth_file, int cert_file_type, apr_ldap_err_t **result_err) @@ -113,7 +113,7 @@ * @todo currently we do not check whether apr_ldap_ssl_init() * has been called first - should we? */ -APU_DECLARE_LDAP(int) apr_ldap_ssl_deinit(void) +APR_DECLARE_LDAP(int) apr_ldap_ssl_deinit(void) { #if APR_HAS_LDAP_SSL && APR_HAS_LDAPSSL_CLIENT_DEINIT @@ -144,7 +144,7 @@ * APR_LDAP_SSL: SSL encryption (ldaps://) * APR_LDAP_STARTTLS: Force STARTTLS on ldap:// */ -APU_DECLARE_LDAP(int) apr_ldap_init(apr_pool_t *pool, +APR_DECLARE_LDAP(int) apr_ldap_init(apr_pool_t *pool, LDAP **ldap, const char *hostname, int portno, @@ -184,7 +184,7 @@ * This function returns a string describing the LDAP toolkit * currently in use. The string is placed inside result_err->reason. */ -APU_DECLARE_LDAP(int) apr_ldap_info(apr_pool_t *pool, +APR_DECLARE_LDAP(int) apr_ldap_info(apr_pool_t *pool, apr_ldap_err_t **result_err) { apr_ldap_err_t *result = (apr_ldap_err_t *)apr_pcalloc(pool, sizeof(apr_ldap_err_t)); Modified: apr/apr/trunk/ldap/apr_ldap_option.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_option.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/ldap/apr_ldap_option.c (original) +++ apr/apr/trunk/ldap/apr_ldap_option.c Thu Jul 16 04:52:56 2009 @@ -48,7 +48,7 @@ * This function gets option values from a given LDAP session if * one was specified. */ -APU_DECLARE_LDAP(int) apr_ldap_get_option(apr_pool_t *pool, +APR_DECLARE_LDAP(int) apr_ldap_get_option(apr_pool_t *pool, LDAP *ldap, int option, void *outvalue, @@ -86,7 +86,7 @@ * will try and apply legacy functions to achieve the same effect, * depending on the platform. */ -APU_DECLARE_LDAP(int) apr_ldap_set_option(apr_pool_t *pool, +APR_DECLARE_LDAP(int) apr_ldap_set_option(apr_pool_t *pool, LDAP *ldap, int option, const void *invalue, Modified: apr/apr/trunk/ldap/apr_ldap_rebind.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_rebind.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/ldap/apr_ldap_rebind.c (original) +++ apr/apr/trunk/ldap/apr_ldap_rebind.c Thu Jul 16 04:52:56 2009 @@ -65,7 +65,7 @@ static apr_status_t apr_ldap_rebind_remove_helper(void *data); /* APR utility routine used to create the xref_lock. */ -APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool) +APR_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool) { apr_status_t retcode = APR_SUCCESS; @@ -83,7 +83,7 @@ } -APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_add(apr_pool_t *pool, +APR_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_add(apr_pool_t *pool, LDAP *ld, const char *bindDN, const char *bindPW) @@ -135,7 +135,7 @@ } -APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_remove(LDAP *ld) +APR_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_remove(LDAP *ld) { apr_ldap_rebind_entry_t *tmp_xref, *prev = NULL; Modified: apr/apr/trunk/ldap/apr_ldap_stub.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_stub.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/ldap/apr_ldap_stub.c (original) +++ apr/apr/trunk/ldap/apr_ldap_stub.c Thu Jul 16 04:52:56 2009 @@ -63,14 +63,14 @@ if (!lfn && (load_ldap(pool) != APR_SUCCESS)) \ return failres; -APU_DECLARE_LDAP(int) apr_ldap_info(apr_pool_t *pool, +APR_DECLARE_LDAP(int) apr_ldap_info(apr_pool_t *pool, apr_ldap_err_t **result_err) { LOAD_LDAP_STUB(pool, -1); return lfn->info(pool, result_err); } -APU_DECLARE_LDAP(int) apr_ldap_init(apr_pool_t *pool, +APR_DECLARE_LDAP(int) apr_ldap_init(apr_pool_t *pool, LDAP **ldap, const char *hostname, int portno, @@ -81,7 +81,7 @@ return lfn->init(pool, ldap, hostname, portno, secure, result_err); } -APU_DECLARE_LDAP(int) apr_ldap_ssl_init(apr_pool_t *pool, +APR_DECLARE_LDAP(int) apr_ldap_ssl_init(apr_pool_t *pool, const char *cert_auth_file, int cert_file_type, apr_ldap_err_t **result_err) @@ -90,14 +90,14 @@ return lfn->ssl_init(pool, cert_auth_file, cert_file_type, result_err); } -APU_DECLARE_LDAP(int) apr_ldap_ssl_deinit(void) +APR_DECLARE_LDAP(int) apr_ldap_ssl_deinit(void) { if (!lfn) return -1; return lfn->ssl_deinit(); } -APU_DECLARE_LDAP(int) apr_ldap_get_option(apr_pool_t *pool, +APR_DECLARE_LDAP(int) apr_ldap_get_option(apr_pool_t *pool, LDAP *ldap, int option, void *outvalue, @@ -107,7 +107,7 @@ return lfn->get_option(pool, ldap, option, outvalue, result_err); } -APU_DECLARE_LDAP(int) apr_ldap_set_option(apr_pool_t *pool, +APR_DECLARE_LDAP(int) apr_ldap_set_option(apr_pool_t *pool, LDAP *ldap, int option, const void *invalue, @@ -117,13 +117,13 @@ return lfn->set_option(pool, ldap, option, invalue, result_err); } -APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool) +APR_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool) { LOAD_LDAP_STUB(pool, APR_EGENERAL); return lfn->rebind_init(pool); } -APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_add(apr_pool_t *pool, +APR_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_add(apr_pool_t *pool, LDAP *ld, const char *bindDN, const char *bindPW) @@ -132,7 +132,7 @@ return lfn->rebind_add(pool, ld, bindDN, bindPW); } -APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_remove(LDAP *ld) +APR_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_remove(LDAP *ld) { if (!lfn) return APR_EGENERAL; Modified: apr/apr/trunk/ldap/apr_ldap_url.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/apr_ldap_url.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/ldap/apr_ldap_url.c (original) +++ apr/apr/trunk/ldap/apr_ldap_url.c Thu Jul 16 04:52:56 2009 @@ -114,7 +114,7 @@ * Is this URL an ldap url? * */ -APU_DECLARE(int) apr_ldap_is_ldap_url(const char *url) +APR_DECLARE(int) apr_ldap_is_ldap_url(const char *url) { int enclosed; const char * scheme; @@ -134,7 +134,7 @@ * Is this URL a secure ldap url? * */ -APU_DECLARE(int) apr_ldap_is_ldaps_url(const char *url) +APR_DECLARE(int) apr_ldap_is_ldaps_url(const char *url) { int enclosed; const char * scheme; @@ -154,7 +154,7 @@ * Is this URL an ldap socket url? * */ -APU_DECLARE(int) apr_ldap_is_ldapi_url(const char *url) +APR_DECLARE(int) apr_ldap_is_ldapi_url(const char *url) { int enclosed; const char * scheme; @@ -256,7 +256,7 @@ * The LDAP result code and reason string is returned in the * apr_ldap_err_t structure. */ -APU_DECLARE(int) apr_ldap_url_parse_ext(apr_pool_t *pool, +APR_DECLARE(int) apr_ldap_url_parse_ext(apr_pool_t *pool, const char *url_in, apr_ldap_url_desc_t **ludpp, apr_ldap_err_t **result_err) @@ -579,7 +579,7 @@ * The LDAP result code and reason string is returned in the * apr_ldap_err_t structure. */ -APU_DECLARE(int) apr_ldap_url_parse(apr_pool_t *pool, +APR_DECLARE(int) apr_ldap_url_parse(apr_pool_t *pool, const char *url_in, apr_ldap_url_desc_t **ludpp, apr_ldap_err_t **result_err) Modified: apr/apr/trunk/memcache/apr_memcache.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/memcache/apr_memcache.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/memcache/apr_memcache.c (original) +++ apr/apr/trunk/memcache/apr_memcache.c Thu Jul 16 04:52:56 2009 @@ -129,7 +129,7 @@ } -APU_DECLARE(apr_status_t) apr_memcache_add_server(apr_memcache_t *mc, apr_memcache_server_t *ms) +APR_DECLARE(apr_status_t) apr_memcache_add_server(apr_memcache_t *mc, apr_memcache_server_t *ms) { apr_status_t rv = APR_SUCCESS; @@ -145,7 +145,7 @@ static apr_status_t mc_version_ping(apr_memcache_server_t *ms); -APU_DECLARE(apr_memcache_server_t *) +APR_DECLARE(apr_memcache_server_t *) apr_memcache_find_server_hash(apr_memcache_t *mc, const apr_uint32_t hash) { if (mc->server_func) { @@ -156,7 +156,7 @@ } } -APU_DECLARE(apr_memcache_server_t *) +APR_DECLARE(apr_memcache_server_t *) apr_memcache_find_server_hash_default(void *baton, apr_memcache_t *mc, const apr_uint32_t hash) { @@ -207,7 +207,7 @@ return ms; } -APU_DECLARE(apr_memcache_server_t *) apr_memcache_find_server(apr_memcache_t *mc, const char *host, apr_port_t port) +APR_DECLARE(apr_memcache_server_t *) apr_memcache_find_server(apr_memcache_t *mc, const char *host, apr_port_t port) { int i; @@ -268,7 +268,7 @@ #endif } -APU_DECLARE(apr_status_t) apr_memcache_enable_server(apr_memcache_t *mc, apr_memcache_server_t *ms) +APR_DECLARE(apr_status_t) apr_memcache_enable_server(apr_memcache_t *mc, apr_memcache_server_t *ms) { apr_status_t rv = APR_SUCCESS; @@ -280,7 +280,7 @@ return rv; } -APU_DECLARE(apr_status_t) apr_memcache_disable_server(apr_memcache_t *mc, apr_memcache_server_t *ms) +APR_DECLARE(apr_status_t) apr_memcache_disable_server(apr_memcache_t *mc, apr_memcache_server_t *ms) { return make_server_dead(mc, ms); } @@ -386,7 +386,7 @@ } #endif -APU_DECLARE(apr_status_t) apr_memcache_server_create(apr_pool_t *p, +APR_DECLARE(apr_status_t) apr_memcache_server_create(apr_pool_t *p, const char *host, apr_port_t port, apr_uint32_t min, apr_uint32_t smax, apr_uint32_t max, apr_uint32_t ttl, @@ -433,7 +433,7 @@ return rv; } -APU_DECLARE(apr_status_t) apr_memcache_create(apr_pool_t *p, +APR_DECLARE(apr_status_t) apr_memcache_create(apr_pool_t *p, apr_uint16_t max_servers, apr_uint32_t flags, apr_memcache_t **memcache) { @@ -527,7 +527,7 @@ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, }; -APU_DECLARE(apr_uint32_t) apr_memcache_hash_crc32(void *baton, +APR_DECLARE(apr_uint32_t) apr_memcache_hash_crc32(void *baton, const char *data, const apr_size_t data_len) { @@ -541,7 +541,7 @@ return ~crc; } -APU_DECLARE(apr_uint32_t) apr_memcache_hash_default(void *baton, +APR_DECLARE(apr_uint32_t) apr_memcache_hash_default(void *baton, const char *data, const apr_size_t data_len) { @@ -551,7 +551,7 @@ return ((apr_memcache_hash_crc32(baton, data, data_len) >> 16) & 0x7fff); } -APU_DECLARE(apr_uint32_t) apr_memcache_hash(apr_memcache_t *mc, +APR_DECLARE(apr_uint32_t) apr_memcache_hash(apr_memcache_t *mc, const char *data, const apr_size_t data_len) { @@ -670,7 +670,7 @@ return rv; } -APU_DECLARE(apr_status_t) +APR_DECLARE(apr_status_t) apr_memcache_set(apr_memcache_t *mc, const char *key, char *data, @@ -685,7 +685,7 @@ timeout, flags); } -APU_DECLARE(apr_status_t) +APR_DECLARE(apr_status_t) apr_memcache_add(apr_memcache_t *mc, const char *key, char *data, @@ -700,7 +700,7 @@ timeout, flags); } -APU_DECLARE(apr_status_t) +APR_DECLARE(apr_status_t) apr_memcache_replace(apr_memcache_t *mc, const char *key, char *data, @@ -716,7 +716,7 @@ } -APU_DECLARE(apr_status_t) +APR_DECLARE(apr_status_t) apr_memcache_getp(apr_memcache_t *mc, apr_pool_t *p, const char *key, @@ -853,7 +853,7 @@ return rv; } -APU_DECLARE(apr_status_t) +APR_DECLARE(apr_status_t) apr_memcache_delete(apr_memcache_t *mc, const char *key, apr_uint32_t timeout) @@ -992,7 +992,7 @@ return rv; } -APU_DECLARE(apr_status_t) +APR_DECLARE(apr_status_t) apr_memcache_incr(apr_memcache_t *mc, const char *key, apr_int32_t inc, @@ -1007,7 +1007,7 @@ } -APU_DECLARE(apr_status_t) +APR_DECLARE(apr_status_t) apr_memcache_decr(apr_memcache_t *mc, const char *key, apr_int32_t inc, @@ -1023,7 +1023,7 @@ -APU_DECLARE(apr_status_t) +APR_DECLARE(apr_status_t) apr_memcache_version(apr_memcache_server_t *ms, apr_pool_t *p, char **baton) @@ -1106,7 +1106,7 @@ } -APU_DECLARE(void) +APR_DECLARE(void) apr_memcache_add_multget_key(apr_pool_t *data_pool, const char* key, apr_hash_t **values) @@ -1165,7 +1165,7 @@ } } -APU_DECLARE(apr_status_t) +APR_DECLARE(apr_status_t) apr_memcache_multgetp(apr_memcache_t *mc, apr_pool_t *temp_pool, apr_pool_t *data_pool, @@ -1635,7 +1635,7 @@ else mc_do_stat(threads, uint32) } -APU_DECLARE(apr_status_t) +APR_DECLARE(apr_status_t) apr_memcache_stats(apr_memcache_server_t *ms, apr_pool_t *p, apr_memcache_stats_t **stats) Modified: apr/apr/trunk/strmatch/apr_strmatch.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/strmatch/apr_strmatch.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/strmatch/apr_strmatch.c (original) +++ apr/apr/trunk/strmatch/apr_strmatch.c Thu Jul 16 04:52:56 2009 @@ -79,7 +79,7 @@ return NULL; } -APU_DECLARE(const apr_strmatch_pattern *) apr_strmatch_precompile( +APR_DECLARE(const apr_strmatch_pattern *) apr_strmatch_precompile( apr_pool_t *p, const char *s, int case_sensitive) { Modified: apr/apr/trunk/uri/apr_uri.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/uri/apr_uri.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/uri/apr_uri.c (original) +++ apr/apr/trunk/uri/apr_uri.c Thu Jul 16 04:52:56 2009 @@ -70,7 +70,7 @@ { NULL, 0xFFFF } /* unknown port */ }; -APU_DECLARE(apr_port_t) apr_uri_port_of_scheme(const char *scheme_str) +APR_DECLARE(apr_port_t) apr_uri_port_of_scheme(const char *scheme_str) { schemes_t *scheme; @@ -87,7 +87,7 @@ /* Unparse a apr_uri_t structure to an URI string. * Optionally suppress the password for security reasons. */ -APU_DECLARE(char *) apr_uri_unparse(apr_pool_t *p, +APR_DECLARE(char *) apr_uri_unparse(apr_pool_t *p, const apr_uri_t *uptr, unsigned flags) { @@ -240,7 +240,7 @@ * - fills in fields of uri_components *uptr * - none on any of the r->* fields */ -APU_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, +APR_DECLARE(apr_status_t) apr_uri_parse(apr_pool_t *p, const char *uri, apr_uri_t *uptr) { const char *s; @@ -405,7 +405,7 @@ * currently at http://www.mcom.com/newsref/std/tunneling_ssl.html * for the format of the "CONNECT host:port HTTP/1.0" request */ -APU_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, +APR_DECLARE(apr_status_t) apr_uri_parse_hostinfo(apr_pool_t *p, const char *hostinfo, apr_uri_t *uptr) { Modified: apr/apr/trunk/util-misc/apr_date.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apr_date.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/util-misc/apr_date.c (original) +++ apr/apr/trunk/util-misc/apr_date.c Thu Jul 16 04:52:56 2009 @@ -52,7 +52,7 @@ * * - swallow remaining characters * - exact match for any other character */ -APU_DECLARE(int) apr_date_checkmask(const char *data, const char *mask) +APR_DECLARE(int) apr_date_checkmask(const char *data, const char *mask) { int i; char d; @@ -142,7 +142,7 @@ * but many changes since then. * */ -APU_DECLARE(apr_time_t) apr_date_parse_http(const char *date) +APR_DECLARE(apr_time_t) apr_date_parse_http(const char *date) { apr_time_exp_t ds; apr_time_t result; @@ -316,7 +316,7 @@ timstr[6],timstr[7]); \ } -APU_DECLARE(apr_time_t) apr_date_parse_rfc(const char *date) +APR_DECLARE(apr_time_t) apr_date_parse_rfc(const char *date) { apr_time_exp_t ds; apr_time_t result; Modified: apr/apr/trunk/util-misc/apr_queue.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apr_queue.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/util-misc/apr_queue.c (original) +++ apr/apr/trunk/util-misc/apr_queue.c Thu Jul 16 04:52:56 2009 @@ -98,7 +98,7 @@ /** * Initialize the apr_queue_t. */ -APU_DECLARE(apr_status_t) apr_queue_create(apr_queue_t **q, +APR_DECLARE(apr_status_t) apr_queue_create(apr_queue_t **q, unsigned int queue_capacity, apr_pool_t *a) { @@ -145,7 +145,7 @@ * the push operation has completed, it signals other threads waiting * in apr_queue_pop() that they may continue consuming sockets. */ -APU_DECLARE(apr_status_t) apr_queue_push(apr_queue_t *queue, void *data) +APR_DECLARE(apr_status_t) apr_queue_push(apr_queue_t *queue, void *data) { apr_status_t rv; @@ -206,7 +206,7 @@ * the push operation completes successfully, it signals other threads * waiting in apr_queue_pop() that they may continue consuming sockets. */ -APU_DECLARE(apr_status_t) apr_queue_trypush(apr_queue_t *queue, void *data) +APR_DECLARE(apr_status_t) apr_queue_trypush(apr_queue_t *queue, void *data) { apr_status_t rv; @@ -244,7 +244,7 @@ /** * not thread safe */ -APU_DECLARE(unsigned int) apr_queue_size(apr_queue_t *queue) { +APR_DECLARE(unsigned int) apr_queue_size(apr_queue_t *queue) { return queue->nelts; } @@ -254,7 +254,7 @@ * Once retrieved, the item is placed into the address specified by * 'data'. */ -APU_DECLARE(apr_status_t) apr_queue_pop(apr_queue_t *queue, void **data) +APR_DECLARE(apr_status_t) apr_queue_pop(apr_queue_t *queue, void **data) { apr_status_t rv; @@ -316,7 +316,7 @@ * items available, return APR_EAGAIN. Once retrieved, * the item is placed into the address specified by 'data'. */ -APU_DECLARE(apr_status_t) apr_queue_trypop(apr_queue_t *queue, void **data) +APR_DECLARE(apr_status_t) apr_queue_trypop(apr_queue_t *queue, void **data) { apr_status_t rv; @@ -351,7 +351,7 @@ return rv; } -APU_DECLARE(apr_status_t) apr_queue_interrupt_all(apr_queue_t *queue) +APR_DECLARE(apr_status_t) apr_queue_interrupt_all(apr_queue_t *queue) { apr_status_t rv; Q_DBG("intr all", queue); @@ -368,7 +368,7 @@ return APR_SUCCESS; } -APU_DECLARE(apr_status_t) apr_queue_term(apr_queue_t *queue) +APR_DECLARE(apr_status_t) apr_queue_term(apr_queue_t *queue) { apr_status_t rv; Modified: apr/apr/trunk/util-misc/apr_reslist.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apr_reslist.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/util-misc/apr_reslist.c (original) +++ apr/apr/trunk/util-misc/apr_reslist.c Thu Jul 16 04:52:56 2009 @@ -173,7 +173,7 @@ * Perform routine maintenance on the resource list. This call * may instantiate new resources or expire old resources. */ -APU_DECLARE(apr_status_t) apr_reslist_maintain(apr_reslist_t *reslist) +APR_DECLARE(apr_status_t) apr_reslist_maintain(apr_reslist_t *reslist) { apr_time_t now; apr_status_t rv; @@ -248,7 +248,7 @@ return APR_SUCCESS; } -APU_DECLARE(apr_status_t) apr_reslist_create(apr_reslist_t **reslist, +APR_DECLARE(apr_status_t) apr_reslist_create(apr_reslist_t **reslist, int min, int smax, int hmax, apr_interval_time_t ttl, apr_reslist_constructor con, @@ -318,12 +318,12 @@ return APR_SUCCESS; } -APU_DECLARE(apr_status_t) apr_reslist_destroy(apr_reslist_t *reslist) +APR_DECLARE(apr_status_t) apr_reslist_destroy(apr_reslist_t *reslist) { return apr_pool_cleanup_run(reslist->pool, reslist, reslist_cleanup); } -APU_DECLARE(apr_status_t) apr_reslist_acquire(apr_reslist_t *reslist, +APR_DECLARE(apr_status_t) apr_reslist_acquire(apr_reslist_t *reslist, void **resource) { apr_status_t rv; @@ -405,7 +405,7 @@ } } -APU_DECLARE(apr_status_t) apr_reslist_release(apr_reslist_t *reslist, +APR_DECLARE(apr_status_t) apr_reslist_release(apr_reslist_t *reslist, void *resource) { apr_res_t *res; @@ -424,13 +424,13 @@ return apr_reslist_maintain(reslist); } -APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist, +APR_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist, apr_interval_time_t timeout) { reslist->timeout = timeout; } -APU_DECLARE(apr_uint32_t) apr_reslist_acquired_count(apr_reslist_t *reslist) +APR_DECLARE(apr_uint32_t) apr_reslist_acquired_count(apr_reslist_t *reslist) { apr_uint32_t count; @@ -445,7 +445,7 @@ return count; } -APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist, +APR_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist, void *resource) { apr_status_t ret; @@ -461,7 +461,7 @@ return ret; } -APU_DECLARE(void) apr_reslist_cleanup_order_set(apr_reslist_t *rl, +APR_DECLARE(void) apr_reslist_cleanup_order_set(apr_reslist_t *rl, apr_uint32_t mode) { apr_pool_cleanup_kill(rl->pool, rl, reslist_cleanup); Modified: apr/apr/trunk/util-misc/apr_rmm.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apr_rmm.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/util-misc/apr_rmm.c (original) +++ apr/apr/trunk/util-misc/apr_rmm.c Thu Jul 16 04:52:56 2009 @@ -210,7 +210,7 @@ } } -APU_DECLARE(apr_status_t) apr_rmm_init(apr_rmm_t **rmm, apr_anylock_t *lock, +APR_DECLARE(apr_status_t) apr_rmm_init(apr_rmm_t **rmm, apr_anylock_t *lock, void *base, apr_size_t size, apr_pool_t *p) { @@ -245,7 +245,7 @@ return APR_ANYLOCK_UNLOCK(lock); } -APU_DECLARE(apr_status_t) apr_rmm_destroy(apr_rmm_t *rmm) +APR_DECLARE(apr_status_t) apr_rmm_destroy(apr_rmm_t *rmm) { apr_status_t rv; rmm_block_t *blk; @@ -278,7 +278,7 @@ return APR_ANYLOCK_UNLOCK(&rmm->lock); } -APU_DECLARE(apr_status_t) apr_rmm_attach(apr_rmm_t **rmm, apr_anylock_t *lock, +APR_DECLARE(apr_status_t) apr_rmm_attach(apr_rmm_t **rmm, apr_anylock_t *lock, void *base, apr_pool_t *p) { apr_anylock_t nulllock; @@ -298,13 +298,13 @@ return APR_SUCCESS; } -APU_DECLARE(apr_status_t) apr_rmm_detach(apr_rmm_t *rmm) +APR_DECLARE(apr_status_t) apr_rmm_detach(apr_rmm_t *rmm) { /* A noop until we introduce locked/refcounts */ return APR_SUCCESS; } -APU_DECLARE(apr_rmm_off_t) apr_rmm_malloc(apr_rmm_t *rmm, apr_size_t reqsize) +APR_DECLARE(apr_rmm_off_t) apr_rmm_malloc(apr_rmm_t *rmm, apr_size_t reqsize) { apr_rmm_off_t this; @@ -323,7 +323,7 @@ return this; } -APU_DECLARE(apr_rmm_off_t) apr_rmm_calloc(apr_rmm_t *rmm, apr_size_t reqsize) +APR_DECLARE(apr_rmm_off_t) apr_rmm_calloc(apr_rmm_t *rmm, apr_size_t reqsize) { apr_rmm_off_t this; @@ -343,7 +343,7 @@ return this; } -APU_DECLARE(apr_rmm_off_t) apr_rmm_realloc(apr_rmm_t *rmm, void *entity, +APR_DECLARE(apr_rmm_off_t) apr_rmm_realloc(apr_rmm_t *rmm, void *entity, apr_size_t reqsize) { apr_rmm_off_t this; @@ -372,7 +372,7 @@ return this; } -APU_DECLARE(apr_status_t) apr_rmm_free(apr_rmm_t *rmm, apr_rmm_off_t this) +APR_DECLARE(apr_status_t) apr_rmm_free(apr_rmm_t *rmm, apr_rmm_off_t this) { apr_status_t rv; struct rmm_block_t *blk; @@ -420,14 +420,14 @@ return APR_ANYLOCK_UNLOCK(&rmm->lock); } -APU_DECLARE(void *) apr_rmm_addr_get(apr_rmm_t *rmm, apr_rmm_off_t entity) +APR_DECLARE(void *) apr_rmm_addr_get(apr_rmm_t *rmm, apr_rmm_off_t entity) { /* debug-sanity checking here would be good */ return (void*)((char*)rmm->base + entity); } -APU_DECLARE(apr_rmm_off_t) apr_rmm_offset_get(apr_rmm_t *rmm, void* entity) +APR_DECLARE(apr_rmm_off_t) apr_rmm_offset_get(apr_rmm_t *rmm, void* entity) { /* debug, or always, sanity checking here would be good * since the primitive is apr_rmm_off_t, I don't mind penalizing @@ -437,7 +437,7 @@ return ((char*)entity - (char*)rmm->base); } -APU_DECLARE(apr_size_t) apr_rmm_overhead_get(int n) +APR_DECLARE(apr_size_t) apr_rmm_overhead_get(int n) { /* overhead per block is at most APR_ALIGN_DEFAULT(1) wasted bytes * for alignment overhead, plus the size of the rmm_block_t Modified: apr/apr/trunk/util-misc/apr_thread_pool.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apr_thread_pool.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/util-misc/apr_thread_pool.c (original) +++ apr/apr/trunk/util-misc/apr_thread_pool.c Thu Jul 16 04:52:56 2009 @@ -355,7 +355,7 @@ return APR_SUCCESS; } -APU_DECLARE(apr_status_t) apr_thread_pool_create(apr_thread_pool_t ** me, +APR_DECLARE(apr_status_t) apr_thread_pool_create(apr_thread_pool_t ** me, apr_size_t init_threads, apr_size_t max_threads, apr_pool_t * pool) @@ -395,7 +395,7 @@ return rv; } -APU_DECLARE(apr_status_t) apr_thread_pool_destroy(apr_thread_pool_t * me) +APR_DECLARE(apr_status_t) apr_thread_pool_destroy(apr_thread_pool_t * me) { return apr_pool_cleanup_run(me->pool, me, thread_pool_cleanup); } @@ -588,7 +588,7 @@ return rv; } -APU_DECLARE(apr_status_t) apr_thread_pool_push(apr_thread_pool_t *me, +APR_DECLARE(apr_status_t) apr_thread_pool_push(apr_thread_pool_t *me, apr_thread_start_t func, void *param, apr_byte_t priority, @@ -597,7 +597,7 @@ return add_task(me, func, param, priority, 1, owner); } -APU_DECLARE(apr_status_t) apr_thread_pool_schedule(apr_thread_pool_t *me, +APR_DECLARE(apr_status_t) apr_thread_pool_schedule(apr_thread_pool_t *me, apr_thread_start_t func, void *param, apr_interval_time_t time, @@ -606,7 +606,7 @@ return schedule_task(me, func, param, owner, time); } -APU_DECLARE(apr_status_t) apr_thread_pool_top(apr_thread_pool_t *me, +APR_DECLARE(apr_status_t) apr_thread_pool_top(apr_thread_pool_t *me, apr_thread_start_t func, void *param, apr_byte_t priority, @@ -698,7 +698,7 @@ return; } -APU_DECLARE(apr_status_t) apr_thread_pool_tasks_cancel(apr_thread_pool_t *me, +APR_DECLARE(apr_status_t) apr_thread_pool_tasks_cancel(apr_thread_pool_t *me, void *owner) { apr_status_t rv = APR_SUCCESS; @@ -716,63 +716,63 @@ return rv; } -APU_DECLARE(apr_size_t) apr_thread_pool_tasks_count(apr_thread_pool_t *me) +APR_DECLARE(apr_size_t) apr_thread_pool_tasks_count(apr_thread_pool_t *me) { return me->task_cnt; } -APU_DECLARE(apr_size_t) +APR_DECLARE(apr_size_t) apr_thread_pool_scheduled_tasks_count(apr_thread_pool_t *me) { return me->scheduled_task_cnt; } -APU_DECLARE(apr_size_t) apr_thread_pool_threads_count(apr_thread_pool_t *me) +APR_DECLARE(apr_size_t) apr_thread_pool_threads_count(apr_thread_pool_t *me) { return me->thd_cnt; } -APU_DECLARE(apr_size_t) apr_thread_pool_busy_count(apr_thread_pool_t *me) +APR_DECLARE(apr_size_t) apr_thread_pool_busy_count(apr_thread_pool_t *me) { return me->thd_cnt - me->idle_cnt; } -APU_DECLARE(apr_size_t) apr_thread_pool_idle_count(apr_thread_pool_t *me) +APR_DECLARE(apr_size_t) apr_thread_pool_idle_count(apr_thread_pool_t *me) { return me->idle_cnt; } -APU_DECLARE(apr_size_t) +APR_DECLARE(apr_size_t) apr_thread_pool_tasks_run_count(apr_thread_pool_t * me) { return me->tasks_run; } -APU_DECLARE(apr_size_t) +APR_DECLARE(apr_size_t) apr_thread_pool_tasks_high_count(apr_thread_pool_t * me) { return me->tasks_high; } -APU_DECLARE(apr_size_t) +APR_DECLARE(apr_size_t) apr_thread_pool_threads_high_count(apr_thread_pool_t * me) { return me->thd_high; } -APU_DECLARE(apr_size_t) +APR_DECLARE(apr_size_t) apr_thread_pool_threads_idle_timeout_count(apr_thread_pool_t * me) { return me->thd_timed_out; } -APU_DECLARE(apr_size_t) apr_thread_pool_idle_max_get(apr_thread_pool_t *me) +APR_DECLARE(apr_size_t) apr_thread_pool_idle_max_get(apr_thread_pool_t *me) { return me->idle_max; } -APU_DECLARE(apr_interval_time_t) +APR_DECLARE(apr_interval_time_t) apr_thread_pool_idle_wait_get(apr_thread_pool_t * me) { return me->idle_wait; @@ -872,7 +872,7 @@ return cnt; } -APU_DECLARE(apr_size_t) apr_thread_pool_idle_max_set(apr_thread_pool_t *me, +APR_DECLARE(apr_size_t) apr_thread_pool_idle_max_set(apr_thread_pool_t *me, apr_size_t cnt) { me->idle_max = cnt; @@ -880,7 +880,7 @@ return cnt; } -APU_DECLARE(apr_interval_time_t) +APR_DECLARE(apr_interval_time_t) apr_thread_pool_idle_wait_set(apr_thread_pool_t * me, apr_interval_time_t timeout) { @@ -892,7 +892,7 @@ return oldtime; } -APU_DECLARE(apr_size_t) apr_thread_pool_thread_max_get(apr_thread_pool_t *me) +APR_DECLARE(apr_size_t) apr_thread_pool_thread_max_get(apr_thread_pool_t *me) { return me->thd_max; } @@ -901,7 +901,7 @@ * This function stop extra working threads to the new limit. * NOTE: There could be busy threads become idle during this function */ -APU_DECLARE(apr_size_t) apr_thread_pool_thread_max_set(apr_thread_pool_t *me, +APR_DECLARE(apr_size_t) apr_thread_pool_thread_max_set(apr_thread_pool_t *me, apr_size_t cnt) { unsigned int n; @@ -922,12 +922,12 @@ return n; } -APU_DECLARE(apr_size_t) apr_thread_pool_threshold_get(apr_thread_pool_t *me) +APR_DECLARE(apr_size_t) apr_thread_pool_threshold_get(apr_thread_pool_t *me) { return me->threshold; } -APU_DECLARE(apr_size_t) apr_thread_pool_threshold_set(apr_thread_pool_t *me, +APR_DECLARE(apr_size_t) apr_thread_pool_threshold_set(apr_thread_pool_t *me, apr_size_t val) { apr_size_t ov; @@ -937,7 +937,7 @@ return ov; } -APU_DECLARE(apr_status_t) apr_thread_pool_task_owner_get(apr_thread_t *thd, +APR_DECLARE(apr_status_t) apr_thread_pool_task_owner_get(apr_thread_t *thd, void **owner) { apr_status_t rv; Modified: apr/apr/trunk/util-misc/apu_version.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apu_version.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/util-misc/apu_version.c (original) +++ apr/apr/trunk/util-misc/apu_version.c Thu Jul 16 04:52:56 2009 @@ -19,7 +19,7 @@ #include "apu.h" #include "apu_version.h" -APU_DECLARE(void) apu_version(apr_version_t *pvsn) +APR_DECLARE(void) apu_version(apr_version_t *pvsn) { pvsn->major = APU_MAJOR_VERSION; pvsn->minor = APU_MINOR_VERSION; @@ -31,7 +31,7 @@ #endif } -APU_DECLARE(const char *) apu_version_string(void) +APR_DECLARE(const char *) apu_version_string(void) { return APU_VERSION_STRING; } Modified: apr/apr/trunk/xlate/xlate.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/xlate/xlate.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/xlate/xlate.c (original) +++ apr/apr/trunk/xlate/xlate.c Thu Jul 16 04:52:56 2009 @@ -195,7 +195,7 @@ convset->sbcs_table[i] = i; } -APU_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset, +APR_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset, const char *topage, const char *frompage, apr_pool_t *pool) @@ -274,13 +274,13 @@ return rv; } -APU_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff) +APR_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff) { *onoff = convset->sbcs_table != NULL; return APR_SUCCESS; } -APU_DECLARE(apr_status_t) apr_xlate_conv_buffer(apr_xlate_t *convset, +APR_DECLARE(apr_status_t) apr_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf, apr_size_t *inbytes_left, char *outbuf, @@ -404,7 +404,7 @@ return status; } -APU_DECLARE(apr_int32_t) apr_xlate_conv_byte(apr_xlate_t *convset, +APR_DECLARE(apr_int32_t) apr_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar) { if (convset->sbcs_table) { @@ -415,14 +415,14 @@ } } -APU_DECLARE(apr_status_t) apr_xlate_close(apr_xlate_t *convset) +APR_DECLARE(apr_status_t) apr_xlate_close(apr_xlate_t *convset) { return apr_pool_cleanup_run(convset->pool, convset, apr_xlate_cleanup); } #else /* !APR_HAS_XLATE */ -APU_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset, +APR_DECLARE(apr_status_t) apr_xlate_open(apr_xlate_t **convset, const char *topage, const char *frompage, apr_pool_t *pool) @@ -430,18 +430,18 @@ return APR_ENOTIMPL; } -APU_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff) +APR_DECLARE(apr_status_t) apr_xlate_sb_get(apr_xlate_t *convset, int *onoff) { return APR_ENOTIMPL; } -APU_DECLARE(apr_int32_t) apr_xlate_conv_byte(apr_xlate_t *convset, +APR_DECLARE(apr_int32_t) apr_xlate_conv_byte(apr_xlate_t *convset, unsigned char inchar) { return (-1); } -APU_DECLARE(apr_status_t) apr_xlate_conv_buffer(apr_xlate_t *convset, +APR_DECLARE(apr_status_t) apr_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf, apr_size_t *inbytes_left, char *outbuf, @@ -450,7 +450,7 @@ return APR_ENOTIMPL; } -APU_DECLARE(apr_status_t) apr_xlate_close(apr_xlate_t *convset) +APR_DECLARE(apr_status_t) apr_xlate_close(apr_xlate_t *convset) { return APR_ENOTIMPL; } Modified: apr/apr/trunk/xml/apr_xml.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/xml/apr_xml.c?rev=794523&r1=794522&r2=794523&view=diff ============================================================================== --- apr/apr/trunk/xml/apr_xml.c (original) +++ apr/apr/trunk/xml/apr_xml.c Thu Jul 16 04:52:56 2009 @@ -366,7 +366,7 @@ } #endif -APU_DECLARE(apr_xml_parser *) apr_xml_parser_create(apr_pool_t *pool) +APR_DECLARE(apr_xml_parser *) apr_xml_parser_create(apr_pool_t *pool) { apr_xml_parser *parser = apr_pcalloc(pool, sizeof(*parser)); @@ -427,14 +427,14 @@ return parser->error ? APR_EGENERAL : APR_SUCCESS; } -APU_DECLARE(apr_status_t) apr_xml_parser_feed(apr_xml_parser *parser, +APR_DECLARE(apr_status_t) apr_xml_parser_feed(apr_xml_parser *parser, const char *data, apr_size_t len) { return do_parse(parser, data, len, 0 /* is_final */); } -APU_DECLARE(apr_status_t) apr_xml_parser_done(apr_xml_parser *parser, +APR_DECLARE(apr_status_t) apr_xml_parser_done(apr_xml_parser *parser, apr_xml_doc **pdoc) { char end; @@ -451,7 +451,7 @@ return APR_SUCCESS; } -APU_DECLARE(char *) apr_xml_parser_geterror(apr_xml_parser *parser, +APR_DECLARE(char *) apr_xml_parser_geterror(apr_xml_parser *parser, char *errbuf, apr_size_t errbufsize) { @@ -493,7 +493,7 @@ return errbuf; } -APU_DECLARE(apr_status_t) apr_xml_parse_file(apr_pool_t *p, +APR_DECLARE(apr_status_t) apr_xml_parse_file(apr_pool_t *p, apr_xml_parser **parser, apr_xml_doc **ppdoc, apr_file_t *xmlfd, @@ -531,7 +531,7 @@ return rv; } -APU_DECLARE(void) apr_text_append(apr_pool_t * p, apr_text_header *hdr, +APR_DECLARE(void) apr_text_append(apr_pool_t * p, apr_text_header *hdr, const char *text) { apr_text *t = apr_palloc(p, sizeof(*t)); @@ -565,7 +565,7 @@ ** quotes is typically set to true for XML strings that will occur within ** double quotes -- attribute values. */ -APU_DECLARE(const char *) apr_xml_quote_string(apr_pool_t *p, const char *s, +APR_DECLARE(const char *) apr_xml_quote_string(apr_pool_t *p, const char *s, int quotes) { const char *scan; @@ -841,7 +841,7 @@ return s; } -APU_DECLARE(void) apr_xml_quote_elem(apr_pool_t *p, apr_xml_elem *elem) +APR_DECLARE(void) apr_xml_quote_elem(apr_pool_t *p, apr_xml_elem *elem) { apr_text *scan_txt; apr_xml_attr *scan_attr; @@ -875,7 +875,7 @@ } /* convert an element to a text string */ -APU_DECLARE(void) apr_xml_to_text(apr_pool_t * p, const apr_xml_elem *elem, +APR_DECLARE(void) apr_xml_to_text(apr_pool_t * p, const apr_xml_elem *elem, int style, apr_array_header_t *namespaces, int *ns_map, const char **pbuf, apr_size_t *psize) @@ -892,7 +892,7 @@ *psize = size; } -APU_DECLARE(const char *) apr_xml_empty_elem(apr_pool_t * p, +APR_DECLARE(const char *) apr_xml_empty_elem(apr_pool_t * p, const apr_xml_elem *elem) { if (elem->ns == APR_XML_NS_NONE) { @@ -907,7 +907,7 @@ } /* return the URI's (existing) index, or insert it and return a new index */ -APU_DECLARE(int) apr_xml_insert_uri(apr_array_header_t *uri_array, +APR_DECLARE(int) apr_xml_insert_uri(apr_array_header_t *uri_array, const char *uri) { int i; @@ -983,7 +983,7 @@ } /* convert the whole document to EBCDIC */ -APU_DECLARE(apr_status_t) apr_xml_parser_convert_doc(apr_pool_t *pool, +APR_DECLARE(apr_status_t) apr_xml_parser_convert_doc(apr_pool_t *pool, apr_xml_doc *pdoc, apr_xlate_t *convset) {