From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 6 Jun 2008 22:21:07 +0000 (+0000)
Subject: Revert prior change; some of these are registered
X-Git-Tag: 2.3.0~536
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8672172fd6ea7d2b405d75f623f3b883318946f;p=apache

Revert prior change; some of these are registered
and therefore the wrong declspec.  But why is the
question, and this should be reviewed before release.

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

diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c
index 1312deaa1d..f1adfd41a2 100644
--- a/modules/database/mod_dbd.c
+++ b/modules/database/mod_dbd.c
@@ -277,8 +277,8 @@ static int dbd_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
    return OK;
 }
 
-DBD_DECLARE(void) ap_dbd_prepare(server_rec *s, const char *query,
-                                 const char *label)
+DBD_DECLARE_NONSTD(void) ap_dbd_prepare(server_rec *s, const char *query,
+                                        const char *label)
 {
     svr_cfg *svr;
 
@@ -687,7 +687,7 @@ static apr_status_t dbd_setup_lock(server_rec *s, dbd_group_t *group)
         - open acquires a connection from the pool (opens one if necessary)
         - close releases it back in to the pool
 */
-DBD_DECLARE(void) ap_dbd_close(server_rec *s, ap_dbd_t *rec)
+DBD_DECLARE_NONSTD(void) ap_dbd_close(server_rec *s, ap_dbd_t *rec)
 {
     svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
 
@@ -725,7 +725,7 @@ static apr_status_t dbd_check(apr_pool_t *pool, server_rec *s, ap_dbd_t *rec)
     return rv;
 }
 
-DBD_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)
+DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)
 {
     svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
     dbd_group_t *group = svr->group;
@@ -804,7 +804,7 @@ static apr_status_t dbd_release(void *data)
     return APR_SUCCESS;
 }
 
-DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
+DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
 {
     dbd_acquire_t *acq;
 
@@ -837,7 +837,7 @@ DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
     return acq->rec;
 }
 
-DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
+DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
 {
     dbd_acquire_t *acq = ap_get_module_config(c->conn_config, &dbd_module);
 
@@ -860,7 +860,7 @@ DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
     return acq->rec;
 }
 #else
-DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
+DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
 {
     ap_dbd_t *rec;
 
@@ -884,7 +884,7 @@ DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
     return rec;
 }
 
-DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
+DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
 {
     ap_dbd_t *rec = ap_get_module_config(c->conn_config, &dbd_module);
 
diff --git a/modules/database/mod_dbd.h b/modules/database/mod_dbd.h
index 41836f6ad7..c3c51f5855 100644
--- a/modules/database/mod_dbd.h
+++ b/modules/database/mod_dbd.h
@@ -69,28 +69,28 @@ typedef struct {
 /* acquire a connection that MUST be explicitly closed.
  * Returns NULL on error
  */
-DBD_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t*, server_rec*);
+DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t*, server_rec*);
 
 /* release a connection acquired with ap_dbd_open */
-DBD_DECLARE(void) ap_dbd_close(server_rec*, ap_dbd_t*);
+DBD_DECLARE_NONSTD(void) ap_dbd_close(server_rec*, ap_dbd_t*);
 
 /* acquire a connection that will have the lifetime of a request
  * and MUST NOT be explicitly closed.  Return NULL on error.
  * This is the preferred function for most applications.
  */
-DBD_DECLARE(ap_dbd_t*) ap_dbd_acquire(request_rec*);
+DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_acquire(request_rec*);
 
 /* acquire a connection that will have the lifetime of a connection
  * and MUST NOT be explicitly closed.  Return NULL on error.
  * This is the preferred function for most applications.
  */
-DBD_DECLARE(ap_dbd_t*) ap_dbd_cacquire(conn_rec*);
+DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_cacquire(conn_rec*);
 
 /* Prepare a statement for use by a client module during
  * the server startup/configuration phase.  Can't be called
  * after the server has created its children (use apr_dbd_*).
  */
-DBD_DECLARE(void) ap_dbd_prepare(server_rec*, const char*, const char*);
+DBD_DECLARE_NONSTD(void) ap_dbd_prepare(server_rec*, const char*, const char*);
 
 /* Also export them as optional functions for modules that prefer it */
 APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_open, (apr_pool_t*, server_rec*));