svn commit: r664109 - in /httpd/httpd/branches/2.2.x/modules/database: mod_dbd.c mod_dbd.h

[wr...@apache.org]

Author: wrowe
Date: Fri Jun  6 13:07:43 2008
New Revision: 664109

URL: http://svn.apache.org/viewvc?rev=664109&view=rev
Log:
Registered functions do need to be NONSTD.

However; why are hook registrations being exported at
all, most registered functions should be static.

Modified:
    httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c
    httpd/httpd/branches/2.2.x/modules/database/mod_dbd.h

Modified: httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c?rev=664109&r1=664108&r2=664109&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c (original)
+++ httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c Fri Jun  6 13:07:43 2008
@@ -272,8 +272,8 @@
    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;
 
@@ -682,7 +682,7 @@
         - 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);
 
@@ -717,7 +717,7 @@
     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;
@@ -796,7 +796,7 @@
     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;
 
@@ -829,7 +829,7 @@
     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);
 
@@ -852,7 +852,7 @@
     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;
 
@@ -876,7 +876,7 @@
     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);
 

Modified: httpd/httpd/branches/2.2.x/modules/database/mod_dbd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/database/mod_dbd.h?rev=664109&r1=664108&r2=664109&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/database/mod_dbd.h (original)
+++ httpd/httpd/branches/2.2.x/modules/database/mod_dbd.h Fri Jun  6 13:07:43 2008
@@ -68,28 +68,28 @@
 /* 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*));