From: Colm MacCarthaigh <colm@apache.org>
Date: Tue, 29 Nov 2005 17:27:02 +0000 (+0000)
Subject: Optional functions are of __cdecl the kind on win32, due to "APU_DECLARE_NONSTD
X-Git-Tag: 2.3.0~2717
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0acff7515059adc634a528acc53b073197d924e2;p=apache

Optional functions are of __cdecl the kind on win32, due to "APU_DECLARE_NONSTD
apr_dynamic_fn_register" from apr-util, so we can't use __stdcall. Declare our
functions as non-std.


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

diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c
index 3d59326124..98af3d9ae7 100644
--- a/modules/database/mod_dbd.c
+++ b/modules/database/mod_dbd.c
@@ -139,7 +139,7 @@ static const char *dbd_param_flag(cmd_parms *cmd, void *cfg, int flag)
     }
     return NULL;
 }
-DBD_DECLARE(void) ap_dbd_prepare(server_rec *s, const char *query,
+DBD_DECLARE_NONSTD(void) ap_dbd_prepare(server_rec *s, const char *query,
                                 const char *label)
 {
     svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
@@ -405,7 +405,7 @@ static apr_status_t dbd_setup_lock(apr_pool_t *pool, server_rec *s)
         - 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 *sql)
+DBD_DECLARE_NONSTD(void) ap_dbd_close(server_rec *s, ap_dbd_t *sql)
 {
     svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
     if (!svr->persist) {
@@ -419,7 +419,7 @@ DBD_DECLARE(void) ap_dbd_close(server_rec *s, ap_dbd_t *sql)
 }
 #define arec ((ap_dbd_t*)rec)
 #if APR_HAS_THREADS
-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)
 {
     void *rec = NULL;
     svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
@@ -457,7 +457,7 @@ DBD_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)
     return arec;
 }
 #else
-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)
 {
     apr_status_t rv = APR_SUCCESS;
     const char *errmsg;
@@ -506,7 +506,7 @@ static apr_status_t dbd_release(void *REQ)
     apr_reslist_release(req->dbpool, req->conn);
     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)
 {
     svr_cfg *svr;
     dbd_pool_rec *req = ap_get_module_config(r->request_config, &dbd_module);
@@ -529,7 +529,7 @@ DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
     }
     return req->conn;
 }
-DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
+DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
 {
     svr_cfg *svr;
     dbd_pool_rec *req = ap_get_module_config(c->conn_config, &dbd_module);
@@ -553,7 +553,7 @@ DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
     return req->conn;
 }
 #else
-DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
+DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
 {
     svr_cfg *svr;
     ap_dbd_t *ret = ap_get_module_config(r->request_config, &dbd_module);
@@ -571,7 +571,7 @@ DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
     }
     return ret;
 }
-DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
+DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
 {
     svr_cfg *svr;
     ap_dbd_t *ret = ap_get_module_config(c->conn_config, &dbd_module);
diff --git a/modules/database/mod_dbd.h b/modules/database/mod_dbd.h
index cbec5a1e77..9a1848cd1e 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*));