apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r794523 [1/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 GMT
Author: bojan
Date: Thu Jul 16 04:52:56 2009
New Revision: 794523

URL: http://svn.apache.org/viewvc?rev=794523&view=rev
Log:
Convert various APU_DECLARE into APR_DECLARE.

Modified:
    apr/apr/trunk/buckets/apr_brigade.c
    apr/apr/trunk/buckets/apr_buckets.c
    apr/apr/trunk/buckets/apr_buckets_alloc.c
    apr/apr/trunk/buckets/apr_buckets_eos.c
    apr/apr/trunk/buckets/apr_buckets_file.c
    apr/apr/trunk/buckets/apr_buckets_flush.c
    apr/apr/trunk/buckets/apr_buckets_heap.c
    apr/apr/trunk/buckets/apr_buckets_mmap.c
    apr/apr/trunk/buckets/apr_buckets_pipe.c
    apr/apr/trunk/buckets/apr_buckets_pool.c
    apr/apr/trunk/buckets/apr_buckets_refcount.c
    apr/apr/trunk/buckets/apr_buckets_simple.c
    apr/apr/trunk/buckets/apr_buckets_socket.c
    apr/apr/trunk/build/MakeEtags
    apr/apr/trunk/build/nw_export.inc
    apr/apr/trunk/crypto/apr_crypto.c
    apr/apr/trunk/crypto/apr_md4.c
    apr/apr/trunk/crypto/apr_md5.c
    apr/apr/trunk/crypto/apr_sha1.c
    apr/apr/trunk/crypto/getuuid.c
    apr/apr/trunk/crypto/uuid.c
    apr/apr/trunk/dbd/apr_dbd.c
    apr/apr/trunk/dbm/apr_dbm.c
    apr/apr/trunk/dbm/sdbm/sdbm.c
    apr/apr/trunk/dbm/sdbm/sdbm_lock.c
    apr/apr/trunk/docs/doxygen.conf
    apr/apr/trunk/docs/win32_builds.html
    apr/apr/trunk/encoding/apr_base64.c
    apr/apr/trunk/hooks/apr_hooks.c
    apr/apr/trunk/include/apr_base64.h
    apr/apr/trunk/include/apr_buckets.h
    apr/apr/trunk/include/apr_crypto.h
    apr/apr/trunk/include/apr_date.h
    apr/apr/trunk/include/apr_dbd.h
    apr/apr/trunk/include/apr_dbm.h
    apr/apr/trunk/include/apr_hooks.h
    apr/apr/trunk/include/apr_ldap.h.in
    apr/apr/trunk/include/apr_ldap.hnw
    apr/apr/trunk/include/apr_ldap.hw
    apr/apr/trunk/include/apr_ldap_init.h
    apr/apr/trunk/include/apr_ldap_option.h
    apr/apr/trunk/include/apr_ldap_rebind.h
    apr/apr/trunk/include/apr_ldap_url.h
    apr/apr/trunk/include/apr_md4.h
    apr/apr/trunk/include/apr_md5.h
    apr/apr/trunk/include/apr_memcache.h
    apr/apr/trunk/include/apr_optional.h
    apr/apr/trunk/include/apr_optional_hooks.h
    apr/apr/trunk/include/apr_queue.h
    apr/apr/trunk/include/apr_reslist.h
    apr/apr/trunk/include/apr_rmm.h
    apr/apr/trunk/include/apr_sdbm.h
    apr/apr/trunk/include/apr_sha1.h
    apr/apr/trunk/include/apr_strmatch.h
    apr/apr/trunk/include/apr_thread_pool.h
    apr/apr/trunk/include/apr_uri.h
    apr/apr/trunk/include/apr_uuid.h
    apr/apr/trunk/include/apr_xlate.h
    apr/apr/trunk/include/apr_xml.h
    apr/apr/trunk/include/apu.h.in
    apr/apr/trunk/include/apu.hnw
    apr/apr/trunk/include/apu.hw
    apr/apr/trunk/include/apu_version.h
    apr/apr/trunk/include/private/apr_dbd_internal.h
    apr/apr/trunk/include/private/apr_dbm_private.h
    apr/apr/trunk/include/private/apu_config.hw
    apr/apr/trunk/ldap/apr_ldap_init.c
    apr/apr/trunk/ldap/apr_ldap_option.c
    apr/apr/trunk/ldap/apr_ldap_rebind.c
    apr/apr/trunk/ldap/apr_ldap_stub.c
    apr/apr/trunk/ldap/apr_ldap_url.c
    apr/apr/trunk/memcache/apr_memcache.c
    apr/apr/trunk/strmatch/apr_strmatch.c
    apr/apr/trunk/uri/apr_uri.c
    apr/apr/trunk/util-misc/apr_date.c
    apr/apr/trunk/util-misc/apr_queue.c
    apr/apr/trunk/util-misc/apr_reslist.c
    apr/apr/trunk/util-misc/apr_rmm.c
    apr/apr/trunk/util-misc/apr_thread_pool.c
    apr/apr/trunk/util-misc/apu_version.c
    apr/apr/trunk/xlate/xlate.c
    apr/apr/trunk/xml/apr_xml.c

Modified: apr/apr/trunk/buckets/apr_brigade.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_brigade.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_brigade.c (original)
+++ apr/apr/trunk/buckets/apr_brigade.c Thu Jul 16 04:52:56 2009
@@ -34,7 +34,7 @@
     return apr_brigade_cleanup(data);
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_cleanup(void *data)
+APR_DECLARE(apr_status_t) apr_brigade_cleanup(void *data)
 {
     apr_bucket_brigade *b = data;
     apr_bucket *e;
@@ -47,13 +47,13 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_destroy(apr_bucket_brigade *b)
+APR_DECLARE(apr_status_t) apr_brigade_destroy(apr_bucket_brigade *b)
 {
     apr_pool_cleanup_kill(b->p, b, brigade_cleanup);
     return apr_brigade_cleanup(b);
 }
 
-APU_DECLARE(apr_bucket_brigade *) apr_brigade_create(apr_pool_t *p,
+APR_DECLARE(apr_bucket_brigade *) apr_brigade_create(apr_pool_t *p,
                                                      apr_bucket_alloc_t *list)
 {
     apr_bucket_brigade *b;
@@ -68,7 +68,7 @@
     return b;
 }
 
-APU_DECLARE(apr_bucket_brigade *) apr_brigade_split_ex(apr_bucket_brigade *b,
+APR_DECLARE(apr_bucket_brigade *) apr_brigade_split_ex(apr_bucket_brigade *b,
                                                        apr_bucket *e,
                                                        apr_bucket_brigade *a)
 {
@@ -95,13 +95,13 @@
     return a;
 }
 
-APU_DECLARE(apr_bucket_brigade *) apr_brigade_split(apr_bucket_brigade *b,
+APR_DECLARE(apr_bucket_brigade *) apr_brigade_split(apr_bucket_brigade *b,
                                                     apr_bucket *e)
 {
     return apr_brigade_split_ex(b, e, NULL);
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_partition(apr_bucket_brigade *b,
+APR_DECLARE(apr_status_t) apr_brigade_partition(apr_bucket_brigade *b,
                                                 apr_off_t point,
                                                 apr_bucket **after_point)
 {
@@ -187,7 +187,7 @@
     return APR_INCOMPLETE;
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_length(apr_bucket_brigade *bb,
+APR_DECLARE(apr_status_t) apr_brigade_length(apr_bucket_brigade *bb,
                                              int read_all, apr_off_t *length)
 {
     apr_off_t total = 0;
@@ -220,7 +220,7 @@
     return status;
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_flatten(apr_bucket_brigade *bb,
+APR_DECLARE(apr_status_t) apr_brigade_flatten(apr_bucket_brigade *bb,
                                               char *c, apr_size_t *len)
 {
     apr_size_t actual = 0;
@@ -265,7 +265,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_pflatten(apr_bucket_brigade *bb,
+APR_DECLARE(apr_status_t) apr_brigade_pflatten(apr_bucket_brigade *bb,
                                                char **c,
                                                apr_size_t *len,
                                                apr_pool_t *pool)
@@ -301,7 +301,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_split_line(apr_bucket_brigade *bbOut,
+APR_DECLARE(apr_status_t) apr_brigade_split_line(apr_bucket_brigade *bbOut,
                                                  apr_bucket_brigade *bbIn,
                                                  apr_read_type_e block,
                                                  apr_off_t maxbytes)
@@ -343,7 +343,7 @@
 }
 
 
-APU_DECLARE(apr_status_t) apr_brigade_to_iovec(apr_bucket_brigade *b, 
+APR_DECLARE(apr_status_t) apr_brigade_to_iovec(apr_bucket_brigade *b, 
                                                struct iovec *vec, int *nvec)
 {
     int left = *nvec;
@@ -375,7 +375,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_vputstrs(apr_bucket_brigade *b, 
+APR_DECLARE(apr_status_t) apr_brigade_vputstrs(apr_bucket_brigade *b, 
                                                apr_brigade_flush flush,
                                                void *ctx,
                                                va_list va)
@@ -395,14 +395,14 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_putc(apr_bucket_brigade *b,
+APR_DECLARE(apr_status_t) apr_brigade_putc(apr_bucket_brigade *b,
                                            apr_brigade_flush flush, void *ctx,
                                            const char c)
 {
     return apr_brigade_write(b, flush, ctx, &c, 1);
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_write(apr_bucket_brigade *b,
+APR_DECLARE(apr_status_t) apr_brigade_write(apr_bucket_brigade *b,
                                             apr_brigade_flush flush,
                                             void *ctx, 
                                             const char *str, apr_size_t nbyte)
@@ -456,7 +456,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_writev(apr_bucket_brigade *b,
+APR_DECLARE(apr_status_t) apr_brigade_writev(apr_bucket_brigade *b,
                                              apr_brigade_flush flush,
                                              void *ctx,
                                              const struct iovec *vec,
@@ -576,7 +576,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_puts(apr_bucket_brigade *bb,
+APR_DECLARE(apr_status_t) apr_brigade_puts(apr_bucket_brigade *bb,
                                            apr_brigade_flush flush, void *ctx,
                                            const char *str)
 {
@@ -605,7 +605,7 @@
     return apr_brigade_write(bb, flush, ctx, str, len);
 }
 
-APU_DECLARE_NONSTD(apr_status_t) apr_brigade_putstrs(apr_bucket_brigade *b, 
+APR_DECLARE_NONSTD(apr_status_t) apr_brigade_putstrs(apr_bucket_brigade *b, 
                                                      apr_brigade_flush flush,
                                                      void *ctx, ...)
 {
@@ -618,7 +618,7 @@
     return rv;
 }
 
-APU_DECLARE_NONSTD(apr_status_t) apr_brigade_printf(apr_bucket_brigade *b, 
+APR_DECLARE_NONSTD(apr_status_t) apr_brigade_printf(apr_bucket_brigade *b, 
                                                     apr_brigade_flush flush,
                                                     void *ctx, 
                                                     const char *fmt, ...)
@@ -666,7 +666,7 @@
     return res;
 }
 
-APU_DECLARE(apr_status_t) apr_brigade_vprintf(apr_bucket_brigade *b,
+APR_DECLARE(apr_status_t) apr_brigade_vprintf(apr_bucket_brigade *b,
                                               apr_brigade_flush flush,
                                               void *ctx,
                                               const char *fmt, va_list va)
@@ -696,7 +696,7 @@
 /* A "safe" maximum bucket size, 1Gb */
 #define MAX_BUCKET_SIZE (0x40000000)
 
-APU_DECLARE(apr_bucket *) apr_brigade_insert_file(apr_bucket_brigade *bb,
+APR_DECLARE(apr_bucket *) apr_brigade_insert_file(apr_bucket_brigade *bb,
                                                   apr_file_t *f,
                                                   apr_off_t start,
                                                   apr_off_t length,

Modified: apr/apr/trunk/buckets/apr_buckets.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets.c (original)
+++ apr/apr/trunk/buckets/apr_buckets.c Thu Jul 16 04:52:56 2009
@@ -16,31 +16,31 @@
 
 #include "apr_buckets.h"
 
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_setaside_noop(apr_bucket *data,
+APR_DECLARE_NONSTD(apr_status_t) apr_bucket_setaside_noop(apr_bucket *data,
                                                           apr_pool_t *pool)
 {
     return APR_SUCCESS;
 }
 
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_setaside_notimpl(apr_bucket *data,
+APR_DECLARE_NONSTD(apr_status_t) apr_bucket_setaside_notimpl(apr_bucket *data,
                                                              apr_pool_t *pool)
 {
     return APR_ENOTIMPL;
 }
 
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_split_notimpl(apr_bucket *data,
+APR_DECLARE_NONSTD(apr_status_t) apr_bucket_split_notimpl(apr_bucket *data,
                                                           apr_size_t point)
 {
     return APR_ENOTIMPL;
 }
 
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_copy_notimpl(apr_bucket *e,
+APR_DECLARE_NONSTD(apr_status_t) apr_bucket_copy_notimpl(apr_bucket *e,
                                                          apr_bucket **c)
 {
     return APR_ENOTIMPL;
 }
 
-APU_DECLARE_NONSTD(void) apr_bucket_destroy_noop(void *data)
+APR_DECLARE_NONSTD(void) apr_bucket_destroy_noop(void *data)
 {
     return;
 }

Modified: apr/apr/trunk/buckets/apr_buckets_alloc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets_alloc.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets_alloc.c (original)
+++ apr/apr/trunk/buckets/apr_buckets_alloc.c Thu Jul 16 04:52:56 2009
@@ -52,7 +52,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create(apr_pool_t *p)
+APR_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create(apr_pool_t *p)
 {
     apr_allocator_t *allocator;
     apr_bucket_alloc_t *list;
@@ -69,7 +69,7 @@
     return list;
 }
 
-APU_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create_ex(
+APR_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create_ex(
                                              apr_allocator_t *allocator)
 {
     apr_bucket_alloc_t *list;
@@ -89,7 +89,7 @@
     return list;
 }
 
-APU_DECLARE_NONSTD(void) apr_bucket_alloc_destroy(apr_bucket_alloc_t *list)
+APR_DECLARE_NONSTD(void) apr_bucket_alloc_destroy(apr_bucket_alloc_t *list)
 {
     if (list->pool) {
         apr_pool_cleanup_kill(list->pool, list, alloc_cleanup);
@@ -99,7 +99,7 @@
 
 }
 
-APU_DECLARE_NONSTD(void *) apr_bucket_alloc(apr_size_t size, 
+APR_DECLARE_NONSTD(void *) apr_bucket_alloc(apr_size_t size, 
                                             apr_bucket_alloc_t *list)
 {
     node_header_t *node;
@@ -163,7 +163,7 @@
 #define check_not_already_free(node)
 #endif
 
-APU_DECLARE_NONSTD(void) apr_bucket_free(void *mem)
+APR_DECLARE_NONSTD(void) apr_bucket_free(void *mem)
 {
     node_header_t *node = (node_header_t *)((char *)mem - SIZEOF_NODE_HEADER_T);
     apr_bucket_alloc_t *list = node->alloc;

Modified: apr/apr/trunk/buckets/apr_buckets_eos.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets_eos.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets_eos.c (original)
+++ apr/apr/trunk/buckets/apr_buckets_eos.c Thu Jul 16 04:52:56 2009
@@ -24,7 +24,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_eos_make(apr_bucket *b)
+APR_DECLARE(apr_bucket *) apr_bucket_eos_make(apr_bucket *b)
 {
     b->length      = 0;
     b->start       = 0;
@@ -34,7 +34,7 @@
     return b;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_eos_create(apr_bucket_alloc_t *list)
+APR_DECLARE(apr_bucket *) apr_bucket_eos_create(apr_bucket_alloc_t *list)
 {
     apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
 
@@ -44,7 +44,7 @@
     return apr_bucket_eos_make(b);
 }
 
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_eos = {
+APR_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_eos = {
     "EOS", 5, APR_BUCKET_METADATA,
     apr_bucket_destroy_noop,
     eos_bucket_read,

Modified: apr/apr/trunk/buckets/apr_buckets_file.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets_file.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets_file.c (original)
+++ apr/apr/trunk/buckets/apr_buckets_file.c Thu Jul 16 04:52:56 2009
@@ -153,7 +153,7 @@
     return rv;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_file_make(apr_bucket *b, apr_file_t *fd,
+APR_DECLARE(apr_bucket *) apr_bucket_file_make(apr_bucket *b, apr_file_t *fd,
                                                apr_off_t offset,
                                                apr_size_t len, apr_pool_t *p)
 {
@@ -172,7 +172,7 @@
     return b;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_file_create(apr_file_t *fd,
+APR_DECLARE(apr_bucket *) apr_bucket_file_create(apr_file_t *fd,
                                                  apr_off_t offset,
                                                  apr_size_t len, apr_pool_t *p,
                                                  apr_bucket_alloc_t *list)
@@ -185,7 +185,7 @@
     return apr_bucket_file_make(b, fd, offset, len, p);
 }
 
-APU_DECLARE(apr_status_t) apr_bucket_file_enable_mmap(apr_bucket *e,
+APR_DECLARE(apr_status_t) apr_bucket_file_enable_mmap(apr_bucket *e,
                                                       int enabled)
 {
 #if APR_HAS_MMAP
@@ -218,7 +218,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_file = {
+APR_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_file = {
     "FILE", 5, APR_BUCKET_DATA,
     file_bucket_destroy,
     file_bucket_read,

Modified: apr/apr/trunk/buckets/apr_buckets_flush.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets_flush.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets_flush.c (original)
+++ apr/apr/trunk/buckets/apr_buckets_flush.c Thu Jul 16 04:52:56 2009
@@ -24,7 +24,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_flush_make(apr_bucket *b)
+APR_DECLARE(apr_bucket *) apr_bucket_flush_make(apr_bucket *b)
 {
     b->length      = 0;
     b->start       = 0;
@@ -34,7 +34,7 @@
     return b;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_flush_create(apr_bucket_alloc_t *list)
+APR_DECLARE(apr_bucket *) apr_bucket_flush_create(apr_bucket_alloc_t *list)
 {
     apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
 
@@ -44,7 +44,7 @@
     return apr_bucket_flush_make(b);
 }
 
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_flush = {
+APR_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_flush = {
     "FLUSH", 5, APR_BUCKET_METADATA, 
     apr_bucket_destroy_noop,
     flush_bucket_read,

Modified: apr/apr/trunk/buckets/apr_buckets_heap.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets_heap.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets_heap.c (original)
+++ apr/apr/trunk/buckets/apr_buckets_heap.c Thu Jul 16 04:52:56 2009
@@ -40,7 +40,7 @@
 
 /* Warning: if you change this function, be sure to
  * change apr_bucket_pool_make() too! */
-APU_DECLARE(apr_bucket *) apr_bucket_heap_make(apr_bucket *b, const char *buf,
+APR_DECLARE(apr_bucket *) apr_bucket_heap_make(apr_bucket *b, const char *buf,
                                                apr_size_t length,
                                                void (*free_func)(void *data))
 {
@@ -73,7 +73,7 @@
     return b;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_heap_create(const char *buf,
+APR_DECLARE(apr_bucket *) apr_bucket_heap_create(const char *buf,
                                                  apr_size_t length,
                                                  void (*free_func)(void *data),
                                                  apr_bucket_alloc_t *list)
@@ -86,7 +86,7 @@
     return apr_bucket_heap_make(b, buf, length, free_func);
 }
 
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_heap = {
+APR_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_heap = {
     "HEAP", 5, APR_BUCKET_DATA,
     heap_bucket_destroy,
     heap_bucket_read,

Modified: apr/apr/trunk/buckets/apr_buckets_mmap.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets_mmap.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets_mmap.c (original)
+++ apr/apr/trunk/buckets/apr_buckets_mmap.c Thu Jul 16 04:52:56 2009
@@ -68,7 +68,7 @@
 /*
  * XXX: are the start and length arguments useful?
  */
-APU_DECLARE(apr_bucket *) apr_bucket_mmap_make(apr_bucket *b, apr_mmap_t *mm, 
+APR_DECLARE(apr_bucket *) apr_bucket_mmap_make(apr_bucket *b, apr_mmap_t *mm, 
                                                apr_off_t start, 
                                                apr_size_t length)
 {
@@ -87,7 +87,7 @@
 }
 
 
-APU_DECLARE(apr_bucket *) apr_bucket_mmap_create(apr_mmap_t *mm, 
+APR_DECLARE(apr_bucket *) apr_bucket_mmap_create(apr_mmap_t *mm, 
                                                  apr_off_t start, 
                                                  apr_size_t length,
                                                  apr_bucket_alloc_t *list)
@@ -132,7 +132,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_mmap = {
+APR_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_mmap = {
     "MMAP", 5, APR_BUCKET_DATA,
     mmap_bucket_destroy,
     mmap_bucket_read,

Modified: apr/apr/trunk/buckets/apr_buckets_pipe.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets_pipe.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets_pipe.c (original)
+++ apr/apr/trunk/buckets/apr_buckets_pipe.c Thu Jul 16 04:52:56 2009
@@ -75,7 +75,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_pipe_make(apr_bucket *b, apr_file_t *p)
+APR_DECLARE(apr_bucket *) apr_bucket_pipe_make(apr_bucket *b, apr_file_t *p)
 {
     /*
      * A pipe is closed when the end is reached in pipe_bucket_read().  If
@@ -98,7 +98,7 @@
     return b;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_pipe_create(apr_file_t *p,
+APR_DECLARE(apr_bucket *) apr_bucket_pipe_create(apr_file_t *p,
                                                  apr_bucket_alloc_t *list)
 {
     apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
@@ -109,7 +109,7 @@
     return apr_bucket_pipe_make(b, p);
 }
 
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_pipe = {
+APR_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_pipe = {
     "PIPE", 5, APR_BUCKET_DATA, 
     apr_bucket_destroy_noop,
     pipe_bucket_read,

Modified: apr/apr/trunk/buckets/apr_buckets_pool.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets_pool.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets_pool.c (original)
+++ apr/apr/trunk/buckets/apr_buckets_pool.c Thu Jul 16 04:52:56 2009
@@ -90,7 +90,7 @@
     }
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_pool_make(apr_bucket *b,
+APR_DECLARE(apr_bucket *) apr_bucket_pool_make(apr_bucket *b,
                       const char *buf, apr_size_t length, apr_pool_t *pool)
 {
     apr_bucket_pool *p;
@@ -119,7 +119,7 @@
     return b;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_pool_create(const char *buf,
+APR_DECLARE(apr_bucket *) apr_bucket_pool_create(const char *buf,
                                                  apr_size_t length,
                                                  apr_pool_t *pool,
                                                  apr_bucket_alloc_t *list)
@@ -132,7 +132,7 @@
     return apr_bucket_pool_make(b, buf, length, pool);
 }
 
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_pool = {
+APR_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_pool = {
     "POOL", 5, APR_BUCKET_DATA,
     pool_bucket_destroy,
     pool_bucket_read,

Modified: apr/apr/trunk/buckets/apr_buckets_refcount.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets_refcount.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets_refcount.c (original)
+++ apr/apr/trunk/buckets/apr_buckets_refcount.c Thu Jul 16 04:52:56 2009
@@ -16,7 +16,7 @@
 
 #include "apr_buckets.h"
 
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_shared_split(apr_bucket *a,
+APR_DECLARE_NONSTD(apr_status_t) apr_bucket_shared_split(apr_bucket *a,
                                                          apr_size_t point)
 {
     apr_bucket_refcount *r = a->data;
@@ -30,7 +30,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_shared_copy(apr_bucket *a,
+APR_DECLARE_NONSTD(apr_status_t) apr_bucket_shared_copy(apr_bucket *a,
                                                         apr_bucket **b)
 {
     apr_bucket_refcount *r = a->data;
@@ -41,14 +41,14 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(int) apr_bucket_shared_destroy(void *data)
+APR_DECLARE(int) apr_bucket_shared_destroy(void *data)
 {
     apr_bucket_refcount *r = data;
     r->refcount--;
     return (r->refcount == 0);
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_shared_make(apr_bucket *b, void *data,
+APR_DECLARE(apr_bucket *) apr_bucket_shared_make(apr_bucket *b, void *data,
                                                  apr_off_t start,
                                                  apr_size_t length)
 {

Modified: apr/apr/trunk/buckets/apr_buckets_simple.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets_simple.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets_simple.c (original)
+++ apr/apr/trunk/buckets/apr_buckets_simple.c Thu Jul 16 04:52:56 2009
@@ -16,7 +16,7 @@
 
 #include "apr_buckets.h"
 
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_simple_copy(apr_bucket *a,
+APR_DECLARE_NONSTD(apr_status_t) apr_bucket_simple_copy(apr_bucket *a,
                                                         apr_bucket **b)
 {
     *b = apr_bucket_alloc(sizeof(**b), a->list); /* XXX: check for failure? */
@@ -25,7 +25,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_simple_split(apr_bucket *a,
+APR_DECLARE_NONSTD(apr_status_t) apr_bucket_simple_split(apr_bucket *a,
                                                          apr_size_t point)
 {
     apr_bucket *b;
@@ -53,7 +53,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_immortal_make(apr_bucket *b,
+APR_DECLARE(apr_bucket *) apr_bucket_immortal_make(apr_bucket *b,
                                                    const char *buf,
                                                    apr_size_t length)
 {
@@ -65,7 +65,7 @@
     return b;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_immortal_create(const char *buf,
+APR_DECLARE(apr_bucket *) apr_bucket_immortal_create(const char *buf,
                                                      apr_size_t length,
                                                      apr_bucket_alloc_t *list)
 {
@@ -95,7 +95,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_transient_make(apr_bucket *b,
+APR_DECLARE(apr_bucket *) apr_bucket_transient_make(apr_bucket *b,
                                                     const char *buf,
                                                     apr_size_t length)
 {
@@ -106,7 +106,7 @@
     return b;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_transient_create(const char *buf,
+APR_DECLARE(apr_bucket *) apr_bucket_transient_create(const char *buf,
                                                       apr_size_t length,
                                                       apr_bucket_alloc_t *list)
 {
@@ -127,7 +127,7 @@
     apr_bucket_simple_copy
 };
 
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_transient = {
+APR_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_transient = {
     "TRANSIENT", 5, APR_BUCKET_DATA,
     apr_bucket_destroy_noop, 
     simple_bucket_read,

Modified: apr/apr/trunk/buckets/apr_buckets_socket.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/apr_buckets_socket.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/buckets/apr_buckets_socket.c (original)
+++ apr/apr/trunk/buckets/apr_buckets_socket.c Thu Jul 16 04:52:56 2009
@@ -75,7 +75,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_socket_make(apr_bucket *b, apr_socket_t *p)
+APR_DECLARE(apr_bucket *) apr_bucket_socket_make(apr_bucket *b, apr_socket_t *p)
 {
     /*
      * XXX: We rely on a cleanup on some pool or other to actually
@@ -93,7 +93,7 @@
     return b;
 }
 
-APU_DECLARE(apr_bucket *) apr_bucket_socket_create(apr_socket_t *p,
+APR_DECLARE(apr_bucket *) apr_bucket_socket_create(apr_socket_t *p,
                                                    apr_bucket_alloc_t *list)
 {
     apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
@@ -104,7 +104,7 @@
     return apr_bucket_socket_make(b, p);
 }
 
-APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_socket = {
+APR_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_socket = {
     "SOCKET", 5, APR_BUCKET_DATA,
     apr_bucket_destroy_noop,
     socket_bucket_read,

Modified: apr/apr/trunk/build/MakeEtags
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/MakeEtags?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/build/MakeEtags (original)
+++ apr/apr/trunk/build/MakeEtags Thu Jul 16 04:52:56 2009
@@ -29,7 +29,6 @@
 # that obscure the function signatures.
 
 ignore=AP_DECLARE,AP_DECLARE_NONSTD,__declspec,APR_DECLARE,APR_DECLARE_NONSTD
-ignore=$ignore,APU_DECLARE,APU_DECLARE_NONSTD
 
 # Create an etags file at the root of the source
 # tree, then create symbol links to it from each

Modified: apr/apr/trunk/build/nw_export.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/nw_export.inc?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/build/nw_export.inc (original)
+++ apr/apr/trunk/build/nw_export.inc Thu Jul 16 04:52:56 2009
@@ -9,9 +9,6 @@
 #undef APR_DECLARE_HOOK
 #undef APR_POOL_DECLARE_ACCESSOR
 #undef APR_DECLARE_DATA
-#undef APU_DECLARE
-#undef APU_DECLARE_NONSTD
-#undef APU_DECLARE_DATA
 
 /* Preprocess all of the standard APR headers. */
 #include "apr_allocator.h"

Modified: apr/apr/trunk/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto.c (original)
+++ apr/apr/trunk/crypto/apr_crypto.c Thu Jul 16 04:52:56 2009
@@ -61,7 +61,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_status_t) apr_crypto_init(apr_pool_t *pool,
+APR_DECLARE(apr_status_t) apr_crypto_init(apr_pool_t *pool,
         const apr_array_header_t *params) {
     apr_status_t ret = APR_SUCCESS;
     apr_pool_t *parent;
@@ -101,7 +101,7 @@
     return ret;
 }
 
-APU_DECLARE(apr_status_t) apr_crypto_get_driver(apr_pool_t *pool, const char *name,
+APR_DECLARE(apr_status_t) apr_crypto_get_driver(apr_pool_t *pool, const char *name,
         const apr_crypto_driver_t **driver, const apr_array_header_t *params,
         const apu_err_t **result) {
 #if APR_HAVE_MODULAR_DSO
@@ -184,7 +184,7 @@
  * @param pool - pool to register any shutdown cleanups, etc
  * @return APR_SUCCESS for success.
  */
-APU_DECLARE(const char *)apr_crypto_driver_name (const apr_crypto_driver_t *driver)
+APR_DECLARE(const char *)apr_crypto_driver_name (const apr_crypto_driver_t *driver)
 {
     return driver->name;
 }
@@ -195,7 +195,7 @@
  * @param params - array of key parameters
  * @param factory - factory pointer will be written here
  */
-APU_DECLARE(apr_status_t) apr_crypto_error(const apr_crypto_t *f,
+APR_DECLARE(apr_status_t) apr_crypto_error(const apr_crypto_t *f,
         const apu_err_t **result) {
     *result = f->result;
     return APR_SUCCESS;
@@ -208,7 +208,7 @@
  * @param params - array of key parameters
  * @param factory - factory pointer will be written here
  */
-APU_DECLARE(apr_status_t) apr_crypto_factory(const apr_crypto_driver_t *driver,
+APR_DECLARE(apr_status_t) apr_crypto_factory(const apr_crypto_driver_t *driver,
         apr_pool_t *pool, const apr_array_header_t *params, apr_crypto_t **f) {
     return driver->factory(pool, params, f);
 }
@@ -241,7 +241,7 @@
  *         not known. APR_EPADDING if padding was requested but is not supported.
  *         APR_ENOTIMPL if not implemented.
  */
-APU_DECLARE(apr_status_t) apr_crypto_passphrase(const apr_crypto_driver_t *driver,
+APR_DECLARE(apr_status_t) apr_crypto_passphrase(const apr_crypto_driver_t *driver,
         apr_pool_t *p, const apr_crypto_t *f, const char *pass,
         apr_size_t passLen, const unsigned char * salt, apr_size_t saltLen,
         const apr_crypto_block_key_type_e type,
@@ -269,7 +269,7 @@
  *         Returns APR_EINIT if the backend failed to initialise the context. Returns
  *         APR_ENOTIMPL if not implemented.
  */
-APU_DECLARE(apr_status_t) apr_crypto_block_encrypt_init(
+APR_DECLARE(apr_status_t) apr_crypto_block_encrypt_init(
         const apr_crypto_driver_t *driver, apr_pool_t *p,
         const apr_crypto_t *f, const apr_crypto_key_t *key,
         const unsigned char **iv, apr_crypto_block_t **ctx,
@@ -296,7 +296,7 @@
  * @return APR_ECRYPT if an error occurred. Returns APR_ENOTIMPL if
  *         not implemented.
  */
-APU_DECLARE(apr_status_t) apr_crypto_block_encrypt(
+APR_DECLARE(apr_status_t) apr_crypto_block_encrypt(
         const apr_crypto_driver_t *driver, apr_crypto_block_t *ctx,
         unsigned char **out, apr_size_t *outlen, const unsigned char *in,
         apr_size_t inlen) {
@@ -322,7 +322,7 @@
  *         formatted.
  * @return APR_ENOTIMPL if not implemented.
  */
-APU_DECLARE(apr_status_t) apr_crypto_block_encrypt_finish(
+APR_DECLARE(apr_status_t) apr_crypto_block_encrypt_finish(
         const apr_crypto_driver_t *driver, apr_crypto_block_t *ctx,
         unsigned char *out, apr_size_t *outlen) {
     return driver->block_encrypt_finish(ctx, out, outlen);
@@ -343,7 +343,7 @@
  *         Returns APR_EINIT if the backend failed to initialise the context. Returns
  *         APR_ENOTIMPL if not implemented.
  */
-APU_DECLARE(apr_status_t) apr_crypto_block_decrypt_init(
+APR_DECLARE(apr_status_t) apr_crypto_block_decrypt_init(
         const apr_crypto_driver_t *driver, apr_pool_t *p,
         const apr_crypto_t *f, const apr_crypto_key_t *key,
         const unsigned char *iv, apr_crypto_block_t **ctx,
@@ -370,7 +370,7 @@
  * @return APR_ECRYPT if an error occurred. Returns APR_ENOTIMPL if
  *         not implemented.
  */
-APU_DECLARE(apr_status_t) apr_crypto_block_decrypt(
+APR_DECLARE(apr_status_t) apr_crypto_block_decrypt(
         const apr_crypto_driver_t *driver, apr_crypto_block_t *ctx,
         unsigned char **out, apr_size_t *outlen, const unsigned char *in,
         apr_size_t inlen) {
@@ -396,7 +396,7 @@
  *         formatted.
  * @return APR_ENOTIMPL if not implemented.
  */
-APU_DECLARE(apr_status_t) apr_crypto_block_decrypt_finish(
+APR_DECLARE(apr_status_t) apr_crypto_block_decrypt_finish(
         const apr_crypto_driver_t *driver, apr_crypto_block_t *ctx,
         unsigned char *out, apr_size_t *outlen) {
     return driver->block_decrypt_finish(ctx, out, outlen);
@@ -409,7 +409,7 @@
  * @param ctx The block context to use.
  * @return Returns APR_ENOTIMPL if not supported.
  */
-APU_DECLARE(apr_status_t) apr_crypto_block_cleanup(
+APR_DECLARE(apr_status_t) apr_crypto_block_cleanup(
         const apr_crypto_driver_t *driver, apr_crypto_block_t *ctx) {
     return driver->block_cleanup(ctx);
 }
@@ -421,7 +421,7 @@
  * @param f The factory to use.
  * @return Returns APR_ENOTIMPL if not supported.
  */
-APU_DECLARE(apr_status_t) apr_crypto_cleanup(const apr_crypto_driver_t *driver,
+APR_DECLARE(apr_status_t) apr_crypto_cleanup(const apr_crypto_driver_t *driver,
         apr_crypto_t *f) {
     return driver->cleanup(f);
 }
@@ -433,7 +433,7 @@
  * @param p The pool to use.
  * @return Returns APR_ENOTIMPL if not supported.
  */
-APU_DECLARE(apr_status_t) apr_crypto_shutdown(const apr_crypto_driver_t *driver,
+APR_DECLARE(apr_status_t) apr_crypto_shutdown(const apr_crypto_driver_t *driver,
         apr_pool_t *p) {
     return driver->shutdown(p);
 }

Modified: apr/apr/trunk/crypto/apr_md4.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_md4.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_md4.c (original)
+++ apr/apr/trunk/crypto/apr_md4.c Thu Jul 16 04:52:56 2009
@@ -110,7 +110,7 @@
 
 /* MD4 initialization. Begins an MD4 operation, writing a new context.
  */
-APU_DECLARE(apr_status_t) apr_md4_init(apr_md4_ctx_t *context)
+APR_DECLARE(apr_status_t) apr_md4_init(apr_md4_ctx_t *context)
 {
     context->count[0] = context->count[1] = 0;
 
@@ -132,7 +132,7 @@
  * to be used for translating the content before calculating the
  * digest.
  */
-APU_DECLARE(apr_status_t) apr_md4_set_xlate(apr_md4_ctx_t *context, 
+APR_DECLARE(apr_status_t) apr_md4_set_xlate(apr_md4_ctx_t *context, 
                                             apr_xlate_t *xlate)
 {
     apr_status_t rv;
@@ -156,7 +156,7 @@
  * operation, processing another message block, and updating the
  * context.
  */
-APU_DECLARE(apr_status_t) apr_md4_update(apr_md4_ctx_t *context,
+APR_DECLARE(apr_status_t) apr_md4_update(apr_md4_ctx_t *context,
                                          const unsigned char *input,
                                          apr_size_t inputLen)
 {
@@ -242,7 +242,7 @@
 /* MD4 finalization. Ends an MD4 message-digest operation, writing the
  * the message digest and zeroizing the context.
  */
-APU_DECLARE(apr_status_t) apr_md4_final(
+APR_DECLARE(apr_status_t) apr_md4_final(
                                     unsigned char digest[APR_MD4_DIGESTSIZE],
                                     apr_md4_ctx_t *context)
 {
@@ -276,7 +276,7 @@
 
 /* MD4 computation in one step (init, update, final)
  */
-APU_DECLARE(apr_status_t) apr_md4(unsigned char digest[APR_MD4_DIGESTSIZE],
+APR_DECLARE(apr_status_t) apr_md4(unsigned char digest[APR_MD4_DIGESTSIZE],
                                   const unsigned char *input,
                                   apr_size_t inputLen)
 {
@@ -396,7 +396,7 @@
 }
 
 #if APR_CHARSET_EBCDIC
-APU_DECLARE(apr_status_t) apr_MD4InitEBCDIC(apr_xlate_t *xlate)
+APR_DECLARE(apr_status_t) apr_MD4InitEBCDIC(apr_xlate_t *xlate)
 {
     xlate_ebcdic_to_ascii = xlate;
     return APR_SUCCESS;

Modified: apr/apr/trunk/crypto/apr_md5.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_md5.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_md5.c (original)
+++ apr/apr/trunk/crypto/apr_md5.c Thu Jul 16 04:52:56 2009
@@ -152,7 +152,7 @@
 
 /* MD5 initialization. Begins an MD5 operation, writing a new context.
  */
-APU_DECLARE(apr_status_t) apr_md5_init(apr_md5_ctx_t *context)
+APR_DECLARE(apr_status_t) apr_md5_init(apr_md5_ctx_t *context)
 {
     context->count[0] = context->count[1] = 0;
     
@@ -170,7 +170,7 @@
  * to be used for translating the content before calculating the
  * digest.
  */
-APU_DECLARE(apr_status_t) apr_md5_set_xlate(apr_md5_ctx_t *context, 
+APR_DECLARE(apr_status_t) apr_md5_set_xlate(apr_md5_ctx_t *context, 
                                             apr_xlate_t *xlate)
 {
 #if APR_HAS_XLATE
@@ -285,7 +285,7 @@
 /* MD5 block update operation. API with the default setting 
  * for EBCDIC translations
  */  
-APU_DECLARE(apr_status_t) apr_md5_update(apr_md5_ctx_t *context,
+APR_DECLARE(apr_status_t) apr_md5_update(apr_md5_ctx_t *context,
                                          const void *input,
                                          apr_size_t inputLen)
 {
@@ -295,7 +295,7 @@
 /* MD5 finalization. Ends an MD5 message-digest operation, writing the
  * the message digest and zeroizing the context.
  */
-APU_DECLARE(apr_status_t) apr_md5_final(unsigned char digest[APR_MD5_DIGESTSIZE],
+APR_DECLARE(apr_status_t) apr_md5_final(unsigned char digest[APR_MD5_DIGESTSIZE],
                                         apr_md5_ctx_t *context)
 {
     unsigned char bits[8];
@@ -328,7 +328,7 @@
 
 /* MD5 in one step (init, update, final)
  */
-APU_DECLARE(apr_status_t) apr_md5(unsigned char digest[APR_MD5_DIGESTSIZE],
+APR_DECLARE(apr_status_t) apr_md5(unsigned char digest[APR_MD5_DIGESTSIZE],
                                   const void *_input,
                                   apr_size_t inputLen)
 {
@@ -467,7 +467,7 @@
 }
 
 #if APR_CHARSET_EBCDIC
-APU_DECLARE(apr_status_t) apr_MD5InitEBCDIC(apr_xlate_t *xlate)
+APR_DECLARE(apr_status_t) apr_MD5InitEBCDIC(apr_xlate_t *xlate)
 {
     xlate_ebcdic_to_ascii = xlate;
     return APR_SUCCESS;
@@ -497,7 +497,7 @@
     }
 }
 
-APU_DECLARE(apr_status_t) apr_md5_encode(const char *pw, const char *salt,
+APR_DECLARE(apr_status_t) apr_md5_encode(const char *pw, const char *salt,
                              char *result, apr_size_t nbytes)
 {
     /*
@@ -695,7 +695,7 @@
  * they match, or APR_EMISMATCH if they don't.  If the platform doesn't
  * support crypt, then the default check is against a clear text string.
  */
-APU_DECLARE(apr_status_t) apr_password_validate(const char *passwd, 
+APR_DECLARE(apr_status_t) apr_password_validate(const char *passwd, 
                                                 const char *hash)
 {
     char sample[120];

Modified: apr/apr/trunk/crypto/apr_sha1.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_sha1.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_sha1.c (original)
+++ apr/apr/trunk/crypto/apr_sha1.c Thu Jul 16 04:52:56 2009
@@ -84,7 +84,7 @@
 #if APR_CHARSET_EBCDIC
 static apr_xlate_t *ebcdic2ascii_xlate;
 
-APU_DECLARE(apr_status_t) apr_SHA1InitEBCDIC(apr_xlate_t *x)
+APR_DECLARE(apr_status_t) apr_SHA1InitEBCDIC(apr_xlate_t *x)
 {
     apr_status_t rv;
     int onoff;
@@ -203,7 +203,7 @@
 
 /* initialize the SHA digest */
 
-APU_DECLARE(void) apr_sha1_init(apr_sha1_ctx_t *sha_info)
+APR_DECLARE(void) apr_sha1_init(apr_sha1_ctx_t *sha_info)
 {
     sha_info->digest[0] = 0x67452301L;
     sha_info->digest[1] = 0xefcdab89L;
@@ -217,7 +217,7 @@
 
 /* update the SHA digest */
 
-APU_DECLARE(void) apr_sha1_update_binary(apr_sha1_ctx_t *sha_info,
+APR_DECLARE(void) apr_sha1_update_binary(apr_sha1_ctx_t *sha_info,
                                      const unsigned char *buffer,
                                      unsigned int count)
 {
@@ -256,7 +256,7 @@
     sha_info->local = count;
 }
 
-APU_DECLARE(void) apr_sha1_update(apr_sha1_ctx_t *sha_info, const char *buf,
+APR_DECLARE(void) apr_sha1_update(apr_sha1_ctx_t *sha_info, const char *buf,
                               unsigned int count)
 {
 #if APR_CHARSET_EBCDIC
@@ -310,7 +310,7 @@
 
 /* finish computing the SHA digest */
 
-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 *sha_info)
 {
     int count, i, j;
@@ -345,7 +345,7 @@
 }
 
 
-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)
 {
     int l;
     apr_sha1_ctx_t context;

Modified: apr/apr/trunk/crypto/getuuid.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/getuuid.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/crypto/getuuid.c (original)
+++ apr/apr/trunk/crypto/getuuid.c Thu Jul 16 04:52:56 2009
@@ -172,7 +172,7 @@
     *timestamp = time_now + fudge;
 }
 
-APU_DECLARE(void) apr_uuid_get(apr_uuid_t *uuid)
+APR_DECLARE(void) apr_uuid_get(apr_uuid_t *uuid)
 {
     apr_uint64_t timestamp;
     unsigned char *d = uuid->data;

Modified: apr/apr/trunk/crypto/uuid.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/uuid.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/crypto/uuid.c (original)
+++ apr/apr/trunk/crypto/uuid.c Thu Jul 16 04:52:56 2009
@@ -22,7 +22,7 @@
 #include "apr_lib.h"
 
 
-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)
 {
     const unsigned char *d = uuid->data;
 
@@ -91,7 +91,7 @@
 }
 #endif
 
-APU_DECLARE(apr_status_t) apr_uuid_parse(apr_uuid_t *uuid,
+APR_DECLARE(apr_status_t) apr_uuid_parse(apr_uuid_t *uuid,
                                          const char *uuid_str)
 {
     int i;

Modified: apr/apr/trunk/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd.c (original)
+++ apr/apr/trunk/dbd/apr_dbd.c Thu Jul 16 04:52:56 2009
@@ -48,19 +48,19 @@
  * no longer be exported.
  */
 static apr_thread_mutex_t* mutex = NULL;
-APU_DECLARE(apr_status_t) apr_dbd_mutex_lock()
+APR_DECLARE(apr_status_t) apr_dbd_mutex_lock()
 {
     return apr_thread_mutex_lock(mutex);
 }
-APU_DECLARE(apr_status_t) apr_dbd_mutex_unlock()
+APR_DECLARE(apr_status_t) apr_dbd_mutex_unlock()
 {
     return apr_thread_mutex_unlock(mutex);
 }
 #else
-APU_DECLARE(apr_status_t) apr_dbd_mutex_lock() {
+APR_DECLARE(apr_status_t) apr_dbd_mutex_lock() {
     return APR_SUCCESS;
 }
-APU_DECLARE(apr_status_t) apr_dbd_mutex_unlock() {
+APR_DECLARE(apr_status_t) apr_dbd_mutex_unlock() {
     return APR_SUCCESS;
 }
 #endif
@@ -87,7 +87,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_status_t) apr_dbd_init(apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_dbd_init(apr_pool_t *pool)
 {
     apr_status_t ret = APR_SUCCESS;
     apr_pool_t *parent;
@@ -153,7 +153,7 @@
     return ret;
 }
 
-APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
+APR_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
                                              const apr_dbd_driver_t **driver)
 {
 #if APR_HAVE_MODULAR_DSO
@@ -211,7 +211,7 @@
     return rv;
 }
 
-APU_DECLARE(apr_status_t) apr_dbd_open_ex(const apr_dbd_driver_t *driver,
+APR_DECLARE(apr_status_t) apr_dbd_open_ex(const apr_dbd_driver_t *driver,
                                           apr_pool_t *pool, const char *params,
                                           apr_dbd_t **handle,
                                           const char **error)
@@ -233,14 +233,14 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_status_t) apr_dbd_open(const apr_dbd_driver_t *driver,
+APR_DECLARE(apr_status_t) apr_dbd_open(const apr_dbd_driver_t *driver,
                                        apr_pool_t *pool, const char *params,
                                        apr_dbd_t **handle)
 {
     return apr_dbd_open_ex(driver,pool,params,handle,NULL);
 }
 
-APU_DECLARE(int) apr_dbd_transaction_start(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_transaction_start(const apr_dbd_driver_t *driver,
                                            apr_pool_t *pool, apr_dbd_t *handle,
                                            apr_dbd_transaction_t **trans)
 {
@@ -253,7 +253,7 @@
     return ret;
 }
 
-APU_DECLARE(int) apr_dbd_transaction_end(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_transaction_end(const apr_dbd_driver_t *driver,
                                          apr_pool_t *pool,
                                          apr_dbd_transaction_t *trans)
 {
@@ -261,58 +261,58 @@
     return driver->end_transaction(trans);
 }
 
-APU_DECLARE(int) apr_dbd_transaction_mode_get(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_transaction_mode_get(const apr_dbd_driver_t *driver,
                                               apr_dbd_transaction_t *trans)
 {
     return driver->transaction_mode_get(trans);
 }
 
-APU_DECLARE(int) apr_dbd_transaction_mode_set(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_transaction_mode_set(const apr_dbd_driver_t *driver,
                                               apr_dbd_transaction_t *trans,
                                               int mode)
 {
     return driver->transaction_mode_set(trans, mode);
 }
 
-APU_DECLARE(apr_status_t) apr_dbd_close(const apr_dbd_driver_t *driver,
+APR_DECLARE(apr_status_t) apr_dbd_close(const apr_dbd_driver_t *driver,
                                         apr_dbd_t *handle)
 {
     return driver->close(handle);
 }
 
-APU_DECLARE(const char*) apr_dbd_name(const apr_dbd_driver_t *driver)
+APR_DECLARE(const char*) apr_dbd_name(const apr_dbd_driver_t *driver)
 {
     return driver->name;
 }
 
-APU_DECLARE(void*) apr_dbd_native_handle(const apr_dbd_driver_t *driver,
+APR_DECLARE(void*) apr_dbd_native_handle(const apr_dbd_driver_t *driver,
                                          apr_dbd_t *handle)
 {
     return driver->native_handle(handle);
 }
 
-APU_DECLARE(int) apr_dbd_check_conn(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_check_conn(const apr_dbd_driver_t *driver,
                                     apr_pool_t *pool,
                                     apr_dbd_t *handle)
 {
     return driver->check_conn(pool, handle);
 }
 
-APU_DECLARE(int) apr_dbd_set_dbname(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_set_dbname(const apr_dbd_driver_t *driver,
                                     apr_pool_t *pool,
                                     apr_dbd_t *handle, const char *name)
 {
     return driver->set_dbname(pool,handle,name);
 }
 
-APU_DECLARE(int) apr_dbd_query(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_query(const apr_dbd_driver_t *driver,
                                apr_dbd_t *handle,
                                int *nrows, const char *statement)
 {
     return driver->query(handle,nrows,statement);
 }
 
-APU_DECLARE(int) apr_dbd_select(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_select(const apr_dbd_driver_t *driver,
                                 apr_pool_t *pool,
                                 apr_dbd_t *handle, apr_dbd_results_t **res,
                                 const char *statement, int random)
@@ -320,19 +320,19 @@
     return driver->select(pool,handle,res,statement,random);
 }
 
-APU_DECLARE(int) apr_dbd_num_cols(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_num_cols(const apr_dbd_driver_t *driver,
                                   apr_dbd_results_t *res)
 {
     return driver->num_cols(res);
 }
 
-APU_DECLARE(int) apr_dbd_num_tuples(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_num_tuples(const apr_dbd_driver_t *driver,
                                     apr_dbd_results_t *res)
 {
     return driver->num_tuples(res);
 }
 
-APU_DECLARE(int) apr_dbd_get_row(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_get_row(const apr_dbd_driver_t *driver,
                                  apr_pool_t *pool,
                                  apr_dbd_results_t *res, apr_dbd_row_t **row,
                                  int rownum)
@@ -340,32 +340,32 @@
     return driver->get_row(pool,res,row,rownum);
 }
 
-APU_DECLARE(const char*) apr_dbd_get_entry(const apr_dbd_driver_t *driver,
+APR_DECLARE(const char*) apr_dbd_get_entry(const apr_dbd_driver_t *driver,
                                            apr_dbd_row_t *row, int col)
 {
     return driver->get_entry(row,col);
 }
 
-APU_DECLARE(const char*) apr_dbd_get_name(const apr_dbd_driver_t *driver,
+APR_DECLARE(const char*) apr_dbd_get_name(const apr_dbd_driver_t *driver,
                                           apr_dbd_results_t *res, int col)
 {
     return driver->get_name(res,col);
 }
 
-APU_DECLARE(const char*) apr_dbd_error(const apr_dbd_driver_t *driver,
+APR_DECLARE(const char*) apr_dbd_error(const apr_dbd_driver_t *driver,
                                        apr_dbd_t *handle, int errnum)
 {
     return driver->error(handle,errnum);
 }
 
-APU_DECLARE(const char*) apr_dbd_escape(const apr_dbd_driver_t *driver,
+APR_DECLARE(const char*) apr_dbd_escape(const apr_dbd_driver_t *driver,
                                         apr_pool_t *pool, const char *string,
                                         apr_dbd_t *handle)
 {
     return driver->escape(pool,string,handle);
 }
 
-APU_DECLARE(int) apr_dbd_prepare(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_prepare(const apr_dbd_driver_t *driver,
                                  apr_pool_t *pool,
                                  apr_dbd_t *handle, const char *query,
                                  const char *label,
@@ -476,7 +476,7 @@
     return driver->prepare(pool,handle,pq,label,nargs,nvals,t,statement);
 }
 
-APU_DECLARE(int) apr_dbd_pquery(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_pquery(const apr_dbd_driver_t *driver,
                                 apr_pool_t *pool,
                                 apr_dbd_t *handle, int *nrows,
                                 apr_dbd_prepared_t *statement,
@@ -485,7 +485,7 @@
     return driver->pquery(pool,handle,nrows,statement,args);
 }
 
-APU_DECLARE(int) apr_dbd_pselect(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_pselect(const apr_dbd_driver_t *driver,
                                  apr_pool_t *pool,
                                  apr_dbd_t *handle, apr_dbd_results_t **res,
                                  apr_dbd_prepared_t *statement, int random,
@@ -494,7 +494,7 @@
     return driver->pselect(pool,handle,res,statement,random,args);
 }
 
-APU_DECLARE_NONSTD(int) apr_dbd_pvquery(const apr_dbd_driver_t *driver,
+APR_DECLARE_NONSTD(int) apr_dbd_pvquery(const apr_dbd_driver_t *driver,
                                         apr_pool_t *pool,
                                         apr_dbd_t *handle, int *nrows,
                                         apr_dbd_prepared_t *statement, ...)
@@ -507,7 +507,7 @@
     return ret;
 }
 
-APU_DECLARE_NONSTD(int) apr_dbd_pvselect(const apr_dbd_driver_t *driver,
+APR_DECLARE_NONSTD(int) apr_dbd_pvselect(const apr_dbd_driver_t *driver,
                                          apr_pool_t *pool, apr_dbd_t *handle,
                                          apr_dbd_results_t **res,
                                          apr_dbd_prepared_t *statement,
@@ -521,7 +521,7 @@
     return ret;
 }
 
-APU_DECLARE(int) apr_dbd_pbquery(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_pbquery(const apr_dbd_driver_t *driver,
                                  apr_pool_t *pool,
                                  apr_dbd_t *handle, int *nrows,
                                  apr_dbd_prepared_t *statement,
@@ -530,7 +530,7 @@
     return driver->pbquery(pool,handle,nrows,statement,args);
 }
 
-APU_DECLARE(int) apr_dbd_pbselect(const apr_dbd_driver_t *driver,
+APR_DECLARE(int) apr_dbd_pbselect(const apr_dbd_driver_t *driver,
                                   apr_pool_t *pool,
                                   apr_dbd_t *handle, apr_dbd_results_t **res,
                                   apr_dbd_prepared_t *statement, int random,
@@ -539,7 +539,7 @@
     return driver->pbselect(pool,handle,res,statement,random,args);
 }
 
-APU_DECLARE_NONSTD(int) apr_dbd_pvbquery(const apr_dbd_driver_t *driver,
+APR_DECLARE_NONSTD(int) apr_dbd_pvbquery(const apr_dbd_driver_t *driver,
                                          apr_pool_t *pool,
                                          apr_dbd_t *handle, int *nrows,
                                          apr_dbd_prepared_t *statement, ...)
@@ -552,7 +552,7 @@
     return ret;
 }
 
-APU_DECLARE_NONSTD(int) apr_dbd_pvbselect(const apr_dbd_driver_t *driver,
+APR_DECLARE_NONSTD(int) apr_dbd_pvbselect(const apr_dbd_driver_t *driver,
                                           apr_pool_t *pool, apr_dbd_t *handle,
                                           apr_dbd_results_t **res,
                                           apr_dbd_prepared_t *statement,
@@ -566,7 +566,7 @@
     return ret;
 }
 
-APU_DECLARE(apr_status_t) apr_dbd_datum_get(const apr_dbd_driver_t *driver,
+APR_DECLARE(apr_status_t) apr_dbd_datum_get(const apr_dbd_driver_t *driver,
                                             apr_dbd_row_t *row, int col,
                                             apr_dbd_type_e type, void *data)
 {

Modified: apr/apr/trunk/dbm/apr_dbm.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/apr_dbm.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/dbm/apr_dbm.c (original)
+++ apr/apr/trunk/dbm/apr_dbm.c Thu Jul 16 04:52:56 2009
@@ -188,7 +188,7 @@
 #endif /* APR_HAVE_MODULAR_DSO */
 }
 
-APU_DECLARE(apr_status_t) apr_dbm_open_ex(apr_dbm_t **pdb, const char *type, 
+APR_DECLARE(apr_status_t) apr_dbm_open_ex(apr_dbm_t **pdb, const char *type, 
                                           const char *pathname, 
                                           apr_int32_t mode,
                                           apr_fileperms_t perm,
@@ -203,56 +203,56 @@
     return rv;
 } 
 
-APU_DECLARE(apr_status_t) apr_dbm_open(apr_dbm_t **pdb, const char *pathname, 
+APR_DECLARE(apr_status_t) apr_dbm_open(apr_dbm_t **pdb, const char *pathname, 
                                        apr_int32_t mode, apr_fileperms_t perm,
                                        apr_pool_t *pool)
 {
     return apr_dbm_open_ex(pdb, DBM_NAME, pathname, mode, perm, pool);
 }
 
-APU_DECLARE(void) apr_dbm_close(apr_dbm_t *dbm)
+APR_DECLARE(void) apr_dbm_close(apr_dbm_t *dbm)
 {
     (*dbm->type->close)(dbm);
 }
 
-APU_DECLARE(apr_status_t) apr_dbm_fetch(apr_dbm_t *dbm, apr_datum_t key,
+APR_DECLARE(apr_status_t) apr_dbm_fetch(apr_dbm_t *dbm, apr_datum_t key,
                                         apr_datum_t *pvalue)
 {
     return (*dbm->type->fetch)(dbm, key, pvalue);
 }
 
-APU_DECLARE(apr_status_t) apr_dbm_store(apr_dbm_t *dbm, apr_datum_t key,
+APR_DECLARE(apr_status_t) apr_dbm_store(apr_dbm_t *dbm, apr_datum_t key,
                                         apr_datum_t value)
 {
     return (*dbm->type->store)(dbm, key, value);
 }
 
-APU_DECLARE(apr_status_t) apr_dbm_delete(apr_dbm_t *dbm, apr_datum_t key)
+APR_DECLARE(apr_status_t) apr_dbm_delete(apr_dbm_t *dbm, apr_datum_t key)
 {
     return (*dbm->type->del)(dbm, key);
 }
 
-APU_DECLARE(int) apr_dbm_exists(apr_dbm_t *dbm, apr_datum_t key)
+APR_DECLARE(int) apr_dbm_exists(apr_dbm_t *dbm, apr_datum_t key)
 {
     return (*dbm->type->exists)(dbm, key);
 }
 
-APU_DECLARE(apr_status_t) apr_dbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey)
+APR_DECLARE(apr_status_t) apr_dbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey)
 {
     return (*dbm->type->firstkey)(dbm, pkey);
 }
 
-APU_DECLARE(apr_status_t) apr_dbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
+APR_DECLARE(apr_status_t) apr_dbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
 {
     return (*dbm->type->nextkey)(dbm, pkey);
 }
 
-APU_DECLARE(void) apr_dbm_freedatum(apr_dbm_t *dbm, apr_datum_t data)
+APR_DECLARE(void) apr_dbm_freedatum(apr_dbm_t *dbm, apr_datum_t data)
 {
     (*dbm->type->freedatum)(dbm, data);
 }
 
-APU_DECLARE(char *) apr_dbm_geterror(apr_dbm_t *dbm, int *errcode,
+APR_DECLARE(char *) apr_dbm_geterror(apr_dbm_t *dbm, int *errcode,
                                      char *errbuf, apr_size_t errbufsize)
 {
     if (errcode != NULL)
@@ -267,7 +267,7 @@
     return errbuf;
 }
 
-APU_DECLARE(apr_status_t) apr_dbm_get_usednames_ex(apr_pool_t *p, 
+APR_DECLARE(apr_status_t) apr_dbm_get_usednames_ex(apr_pool_t *p, 
                                                    const char *type, 
                                                    const char *pathname,
                                                    const char **used1,
@@ -283,7 +283,7 @@
     return rv;
 } 
 
-APU_DECLARE(void) apr_dbm_get_usednames(apr_pool_t *p,
+APR_DECLARE(void) apr_dbm_get_usednames(apr_pool_t *p,
                                         const char *pathname,
                                         const char **used1,
                                         const char **used2)
@@ -294,7 +294,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)
 {
     int mode = 0;
 

Modified: apr/apr/trunk/dbm/sdbm/sdbm.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/sdbm/sdbm.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/dbm/sdbm/sdbm.c (original)
+++ apr/apr/trunk/dbm/sdbm/sdbm.c Thu Jul 16 04:52:56 2009
@@ -167,7 +167,7 @@
     return status;
 }
 
-APU_DECLARE(apr_status_t) apr_sdbm_open(apr_sdbm_t **db, const char *file, 
+APR_DECLARE(apr_status_t) apr_sdbm_open(apr_sdbm_t **db, const char *file, 
                                         apr_int32_t flags, 
                                         apr_fileperms_t perms, apr_pool_t *p)
 {
@@ -177,12 +177,12 @@
     return prep(db, dirname, pagname, flags, perms, p);
 }
 
-APU_DECLARE(apr_status_t) apr_sdbm_close(apr_sdbm_t *db)
+APR_DECLARE(apr_status_t) apr_sdbm_close(apr_sdbm_t *db)
 {
     return apr_pool_cleanup_run(db->pool, db, database_cleanup);
 }
 
-APU_DECLARE(apr_status_t) apr_sdbm_fetch(apr_sdbm_t *db, apr_sdbm_datum_t *val,
+APR_DECLARE(apr_status_t) apr_sdbm_fetch(apr_sdbm_t *db, apr_sdbm_datum_t *val,
                                          apr_sdbm_datum_t key)
 {
     apr_status_t status;
@@ -214,7 +214,7 @@
     return status;
 }
 
-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)
 {
     apr_status_t status;
@@ -240,7 +240,7 @@
     return status;
 }
 
-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 val, int flags)
 {
     int need;
@@ -399,7 +399,7 @@
  * the following two routines will break if
  * deletions aren't taken into account. (ndbm bug)
  */
-APU_DECLARE(apr_status_t) apr_sdbm_firstkey(apr_sdbm_t *db, 
+APR_DECLARE(apr_status_t) apr_sdbm_firstkey(apr_sdbm_t *db, 
                                             apr_sdbm_datum_t *key)
 {
     apr_status_t status;
@@ -423,7 +423,7 @@
     return status;
 }
 
-APU_DECLARE(apr_status_t) apr_sdbm_nextkey(apr_sdbm_t *db, 
+APR_DECLARE(apr_status_t) apr_sdbm_nextkey(apr_sdbm_t *db, 
                                            apr_sdbm_datum_t *key)
 {
     apr_status_t status;
@@ -574,7 +574,7 @@
 }
 
 
-APU_DECLARE(int) apr_sdbm_rdonly(apr_sdbm_t *db)
+APR_DECLARE(int) apr_sdbm_rdonly(apr_sdbm_t *db)
 {
     /* ### Should we return true if the first lock is a share lock,
      *     to reflect that apr_sdbm_store and apr_sdbm_delete will fail?

Modified: apr/apr/trunk/dbm/sdbm/sdbm_lock.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/sdbm/sdbm_lock.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/dbm/sdbm/sdbm_lock.c (original)
+++ apr/apr/trunk/dbm/sdbm/sdbm_lock.c Thu Jul 16 04:52:56 2009
@@ -22,7 +22,7 @@
 #include "sdbm_tune.h"
 
 /* NOTE: this function may block until it acquires the lock */
-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)
 {
     apr_status_t status;
     int lock_type = type & APR_FLOCK_TYPEMASK;
@@ -68,7 +68,7 @@
     return status;
 }
 
-APU_DECLARE(apr_status_t) apr_sdbm_unlock(apr_sdbm_t *db)
+APR_DECLARE(apr_status_t) apr_sdbm_unlock(apr_sdbm_t *db)
 {
     if (!(db->flags & (SDBM_SHARED_LOCK | SDBM_EXCLUSIVE_LOCK)))
         return APR_EINVAL;

Modified: apr/apr/trunk/docs/doxygen.conf
URL: http://svn.apache.org/viewvc/apr/apr/trunk/docs/doxygen.conf?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/docs/doxygen.conf (original)
+++ apr/apr/trunk/docs/doxygen.conf Thu Jul 16 04:52:56 2009
@@ -13,16 +13,13 @@
 # not sure why this doesn't work as EXPAND_AS_DEFINED, it should!
 PREDEFINED="APR_DECLARE(x)=x" \
            "APR_DECLARE_NONSTD(x)=x" \
+           "APR_DECLARE_LDAP(x)=x" \
            "APR_DECLARE_DATA" \
            "APR_POOL_DECLARE_ACCESSOR(x)=apr_pool_t* apr_##x##_pool_get (const apr_##x##_t *the##x)" \
            "APR_DECLARE_INHERIT_SET(x)=apr_status_t apr_##x##_inherit_set(apr_##x##_t *the##x)" \
            "APR_DECLARE_INHERIT_UNSET(x)=apr_status_t apr_##x##_inherit_unset(apr_##x##_t *the##x)" \
            "APR_HAS_THREADS" \
-           "APU_DECLARE(x)=x" \
-           "APU_DECLARE_NONSTD(x)=x" \
-           "APU_DECLARE_DATA" \
            "APU_MODULE_DECLARE_DATA" \
-           "APU_DECLARE_LDAP(x)=x" \
            "APR_HAS_MMAP" \
            "APR_HAS_XLATE" \
            "__attribute__(x)=" \

Modified: apr/apr/trunk/docs/win32_builds.html
URL: http://svn.apache.org/viewvc/apr/apr/trunk/docs/win32_builds.html?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/docs/win32_builds.html (original)
+++ apr/apr/trunk/docs/win32_builds.html Thu Jul 16 04:52:56 2009
@@ -13,7 +13,7 @@
   <dt>apr/libapr.dsp</dt>
     <dd>Builds the dynamic libapr.dll library (no define required)</dd>
   <dt>apr-util/aprutil.dsp</dt>
-    <dd>Builds the static aprutil.lib library (-D APU_DECLARE_STATIC)</dd>
+    <dd>Builds the static aprutil.lib library (-D APR_DECLARE_STATIC)</dd>
   <dt>apr-util/libaprutil.dsp</dt>
     <dd>Builds the dynamic libaprutil.dll library (no define required)</dd>
   <dt>apr-iconv/apriconv.dsp</dt>

Modified: apr/apr/trunk/encoding/apr_base64.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/encoding/apr_base64.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/encoding/apr_base64.c (original)
+++ apr/apr/trunk/encoding/apr_base64.c Thu Jul 16 04:52:56 2009
@@ -71,7 +71,7 @@
 static apr_xlate_t *xlate_to_ebcdic;
 static unsigned char os_toascii[256];
 
-APU_DECLARE(apr_status_t) apr_base64init_ebcdic(apr_xlate_t *to_ascii,
+APR_DECLARE(apr_status_t) apr_base64init_ebcdic(apr_xlate_t *to_ascii,
                                              apr_xlate_t *to_ebcdic)
 {
     int i;
@@ -107,7 +107,7 @@
 }
 #endif /*APR_CHARSET_EBCDIC*/
 
-APU_DECLARE(int) apr_base64_decode_len(const char *bufcoded)
+APR_DECLARE(int) apr_base64_decode_len(const char *bufcoded)
 {
     int nbytesdecoded;
     register const unsigned char *bufin;
@@ -122,7 +122,7 @@
     return nbytesdecoded + 1;
 }
 
-APU_DECLARE(int) apr_base64_decode(char *bufplain, const char *bufcoded)
+APR_DECLARE(int) apr_base64_decode(char *bufplain, const char *bufcoded)
 {
 #if APR_CHARSET_EBCDIC
     apr_size_t inbytes_left, outbytes_left;
@@ -142,7 +142,7 @@
 /* This is the same as apr_base64_decode() except on EBCDIC machines, where
  * the conversion of the output to ebcdic is left out.
  */
-APU_DECLARE(int) apr_base64_decode_binary(unsigned char *bufplain,
+APR_DECLARE(int) apr_base64_decode_binary(unsigned char *bufplain,
 				   const char *bufcoded)
 {
     int nbytesdecoded;
@@ -190,12 +190,12 @@
 static const char basis_64[] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-APU_DECLARE(int) apr_base64_encode_len(int len)
+APR_DECLARE(int) apr_base64_encode_len(int len)
 {
     return ((len + 2) / 3 * 4) + 1;
 }
 
-APU_DECLARE(int) apr_base64_encode(char *encoded, const char *string, int len)
+APR_DECLARE(int) apr_base64_encode(char *encoded, const char *string, int len)
 {
 #if !APR_CHARSET_EBCDIC
     return apr_base64_encode_binary(encoded, (const unsigned char *) string, len);
@@ -234,7 +234,7 @@
 /* This is the same as apr_base64_encode() except on EBCDIC machines, where
  * the conversion of the input to ascii is left out.
  */
-APU_DECLARE(int) apr_base64_encode_binary(char *encoded,
+APR_DECLARE(int) apr_base64_encode_binary(char *encoded,
                                       const unsigned char *string, int len)
 {
     int i;

Modified: apr/apr/trunk/hooks/apr_hooks.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/hooks/apr_hooks.c?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/hooks/apr_hooks.c (original)
+++ apr/apr/trunk/hooks/apr_hooks.c Thu Jul 16 04:52:56 2009
@@ -33,18 +33,18 @@
 #define apr_palloc(pool,size)	malloc(size)
 #endif
 
-APU_DECLARE_DATA apr_pool_t *apr_hook_global_pool = NULL;
-APU_DECLARE_DATA int apr_hook_debug_enabled = 0;
-APU_DECLARE_DATA const char *apr_hook_debug_current = NULL;
+APR_DECLARE_DATA apr_pool_t *apr_hook_global_pool = NULL;
+APR_DECLARE_DATA int apr_hook_debug_enabled = 0;
+APR_DECLARE_DATA const char *apr_hook_debug_current = NULL;
 
 /** @deprecated @see apr_hook_global_pool */
-APU_DECLARE_DATA apr_pool_t *apr_global_hook_pool = NULL;
+APR_DECLARE_DATA apr_pool_t *apr_global_hook_pool = NULL;
 
 /** @deprecated @see apr_hook_debug_enabled */
-APU_DECLARE_DATA int apr_debug_module_hooks = 0;
+APR_DECLARE_DATA int apr_debug_module_hooks = 0;
 
 /** @deprecated @see apr_hook_debug_current */
-APU_DECLARE_DATA const char *apr_current_hooking_module = NULL;
+APR_DECLARE_DATA const char *apr_current_hooking_module = NULL;
 
 /* NB: This must echo the LINK_##name structure */
 typedef struct
@@ -221,7 +221,7 @@
     apr_array_header_t **paHooks;
 } HookSortEntry;
 
-APU_DECLARE(void) apr_hook_sort_register(const char *szHookName,
+APR_DECLARE(void) apr_hook_sort_register(const char *szHookName,
 					apr_array_header_t **paHooks)
 {
 #ifdef NETWARE
@@ -236,7 +236,7 @@
     pEntry->paHooks=paHooks;
 }
 
-APU_DECLARE(void) apr_hook_sort_all(void)
+APR_DECLARE(void) apr_hook_sort_all(void)
 {
 #ifdef NETWARE
     get_apd
@@ -258,7 +258,7 @@
 static apr_hash_t *s_phOptionalFunctions;
 #endif
 
-APU_DECLARE(void) apr_hook_deregister_all(void)
+APR_DECLARE(void) apr_hook_deregister_all(void)
 {
 #ifdef NETWARE
     get_apd
@@ -278,7 +278,7 @@
     s_phOptionalFunctions=NULL;
 }
 
-APU_DECLARE(void) apr_hook_debug_show(const char *szName,
+APR_DECLARE(void) apr_hook_debug_show(const char *szName,
                                       const char * const *aszPre,
 			              const char * const *aszSucc)
 {
@@ -316,7 +316,7 @@
 
 APR_DECLARE_EXTERNAL_HOOK(apr,APU,void,_optional,(void))
 
-APU_DECLARE(apr_array_header_t *) apr_optional_hook_get(const char *szName)
+APR_DECLARE(apr_array_header_t *) apr_optional_hook_get(const char *szName)
 {
 #ifdef NETWARE
     get_apd
@@ -331,7 +331,7 @@
     return *ppArray;
 }
 
-APU_DECLARE(void) apr_optional_hook_add(const char *szName,void (*pfn)(void),
+APR_DECLARE(void) apr_optional_hook_add(const char *szName,void (*pfn)(void),
 					const char * const *aszPre,
 					const char * const *aszSucc,int nOrder)
 {
@@ -365,7 +365,7 @@
 
 /* optional function support */
 
-APU_DECLARE(apr_opt_fn_t *) apr_dynamic_fn_retrieve(const char *szName)
+APR_DECLARE(apr_opt_fn_t *) apr_dynamic_fn_retrieve(const char *szName)
 {
 #ifdef NETWARE
     get_apd
@@ -376,7 +376,7 @@
 }
 
 /* Deprecated */
-APU_DECLARE_NONSTD(void) apr_dynamic_fn_register(const char *szName,
+APR_DECLARE_NONSTD(void) apr_dynamic_fn_register(const char *szName,
                                                   apr_opt_fn_t *pfn)
 {
 #ifdef NETWARE

Modified: apr/apr/trunk/include/apr_base64.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_base64.h?rev=794523&r1=794522&r2=794523&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_base64.h (original)
+++ apr/apr/trunk/include/apr_base64.h Thu Jul 16 04:52:56 2009
@@ -56,7 +56,7 @@
  * @param len the length of an unencrypted string.
  * @return the length of the string after it is encrypted
  */ 
-APU_DECLARE(int) apr_base64_encode_len(int len);
+APR_DECLARE(int) apr_base64_encode_len(int len);
 
 /**
  * Encode a text string using base64encoding.
@@ -65,7 +65,7 @@
  * @param len_plain_src The length of the plain text string
  * @return the length of the encoded string
  */ 
-APU_DECLARE(int) apr_base64_encode(char * coded_dst, const char *plain_src, 
+APR_DECLARE(int) apr_base64_encode(char * coded_dst, const char *plain_src, 
                                  int len_plain_src);
 
 /**
@@ -75,7 +75,7 @@
  * @param len_plain_src The length of the plain text string
  * @return the length of the encoded string
  */ 
-APU_DECLARE(int) apr_base64_encode_binary(char * coded_dst, 
+APR_DECLARE(int) apr_base64_encode_binary(char * coded_dst, 
                                         const unsigned char *plain_src,
                                         int len_plain_src);
 
@@ -85,7 +85,7 @@
  * @param coded_src The encoded string
  * @return the maximum required buffer length for the plain text string
  */ 
-APU_DECLARE(int) apr_base64_decode_len(const char * coded_src);
+APR_DECLARE(int) apr_base64_decode_len(const char * coded_src);
 
 /**
  * Decode a string to plain text
@@ -93,7 +93,7 @@
  * @param coded_src The encoded string 
  * @return the length of the plain text string
  */ 
-APU_DECLARE(int) apr_base64_decode(char * plain_dst, const char *coded_src);
+APR_DECLARE(int) apr_base64_decode(char * plain_dst, const char *coded_src);
 
 /**
  * Decode an EBCDIC string to plain text
@@ -101,7 +101,7 @@
  * @param coded_src The encoded string 
  * @return the length of the plain text string
  */ 
-APU_DECLARE(int) apr_base64_decode_binary(unsigned char * plain_dst, 
+APR_DECLARE(int) apr_base64_decode_binary(unsigned char * plain_dst, 
                                         const char *coded_src);
 
 /** @} */



Mime
View raw message