Convert various APU_DECLARE into APR_DECLARE.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@794523 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 24 insertions, 24 deletions

diff --git a/dbm/apr_dbm.c b/dbm/apr_dbm.c
index bbe937d81..dbb064dca 100644
--- a/dbm/apr_dbm.c
+++ b/dbm/apr_dbm.c
@@ -188,7 +188,7 @@ static apr_status_t dbm_open_type(apr_dbm_type_t const* * vtable,
 #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 @@ APU_DECLARE(apr_status_t) apr_dbm_open_ex(apr_dbm_t **pdb, const char *type,
     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 @@ APU_DECLARE(char *) apr_dbm_geterror(apr_dbm_t *dbm, int *errcode,
     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 @@ APU_DECLARE(apr_status_t) apr_dbm_get_usednames_ex(apr_pool_t *p,
     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 @@ APU_DECLARE(void) apr_dbm_get_usednames(apr_pool_t *p,
 /* 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;
 
diff --git a/dbm/sdbm/sdbm.c b/dbm/sdbm/sdbm.c
index 9dfcc4bce..7fa9431f5 100644
--- a/dbm/sdbm/sdbm.c
+++ b/dbm/sdbm/sdbm.c
@@ -167,7 +167,7 @@ error:
     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 @@ APU_DECLARE(apr_status_t) apr_sdbm_open(apr_sdbm_t **db, const char *file,
     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 @@ static apr_status_t write_page(apr_sdbm_t *db, const char *buf, long pagno)
     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 @@ APU_DECLARE(apr_status_t) apr_sdbm_delete(apr_sdbm_t *db,
     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 @@ static apr_status_t read_from(apr_file_t *f, void *buf,
  * 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 @@ APU_DECLARE(apr_status_t) apr_sdbm_firstkey(apr_sdbm_t *db,
     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 @@ static apr_status_t getnext(apr_sdbm_datum_t *key, apr_sdbm_t *db)
 }
 
 
-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?
diff --git a/dbm/sdbm/sdbm_lock.c b/dbm/sdbm/sdbm_lock.c
index 7d62ffd62..9241c1fb6 100644
--- a/dbm/sdbm/sdbm_lock.c
+++ b/dbm/sdbm/sdbm_lock.c
@@ -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 @@ APU_DECLARE(apr_status_t) apr_sdbm_lock(apr_sdbm_t *db, int type)
     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;