Skip to content

Commit cfd0a7c

Browse files
wrowewrowe
committed
No.
_NONSTD refers to type fn(arg, arg, ...) incomplete declarations git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@664078 13f79535-47bb-0310-9956-ffa450edef68
1 parent 2fad5d8 commit cfd0a7c

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎modules/database/mod_dbd.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ static int dbd_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
272272
return OK;
273273
}
274274

275-
DBD_DECLARE_NONSTD(void) ap_dbd_prepare(server_rec *s, const char *query,
276-
const char *label)
275+
DBD_DECLARE(void) ap_dbd_prepare(server_rec *s, const char *query,
276+
const char *label)
277277
{
278278
svr_cfg *svr;
279279

@@ -682,7 +682,7 @@ static apr_status_t dbd_setup_lock(server_rec *s, dbd_group_t *group)
682682
- open acquires a connection from the pool (opens one if necessary)
683683
- close releases it back in to the pool
684684
*/
685-
DBD_DECLARE_NONSTD(void) ap_dbd_close(server_rec *s, ap_dbd_t *rec)
685+
DBD_DECLARE(void) ap_dbd_close(server_rec *s, ap_dbd_t *rec)
686686
{
687687
svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
688688

@@ -717,7 +717,7 @@ static apr_status_t dbd_check(apr_pool_t *pool, server_rec *s, ap_dbd_t *rec)
717717
return rv;
718718
}
719719

720-
DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)
720+
DBD_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s)
721721
{
722722
svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
723723
dbd_group_t *group = svr->group;
@@ -796,7 +796,7 @@ static apr_status_t dbd_release(void *data)
796796
return APR_SUCCESS;
797797
}
798798

799-
DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
799+
DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
800800
{
801801
dbd_acquire_t *acq;
802802

@@ -829,7 +829,7 @@ DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
829829
return acq->rec;
830830
}
831831

832-
DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
832+
DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
833833
{
834834
dbd_acquire_t *acq = ap_get_module_config(c->conn_config, &dbd_module);
835835

@@ -852,7 +852,7 @@ DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
852852
return acq->rec;
853853
}
854854
#else
855-
DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
855+
DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
856856
{
857857
ap_dbd_t *rec;
858858

@@ -876,7 +876,7 @@ DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
876876
return rec;
877877
}
878878

879-
DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
879+
DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
880880
{
881881
ap_dbd_t *rec = ap_get_module_config(c->conn_config, &dbd_module);
882882

‎modules/database/mod_dbd.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,28 +68,28 @@ typedef struct {
6868
/* acquire a connection that MUST be explicitly closed.
6969
* Returns NULL on error
7070
*/
71-
DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t*, server_rec*);
71+
DBD_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t*, server_rec*);
7272

7373
/* release a connection acquired with ap_dbd_open */
74-
DBD_DECLARE_NONSTD(void) ap_dbd_close(server_rec*, ap_dbd_t*);
74+
DBD_DECLARE(void) ap_dbd_close(server_rec*, ap_dbd_t*);
7575

7676
/* acquire a connection that will have the lifetime of a request
7777
* and MUST NOT be explicitly closed. Return NULL on error.
7878
* This is the preferred function for most applications.
7979
*/
80-
DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_acquire(request_rec*);
80+
DBD_DECLARE(ap_dbd_t*) ap_dbd_acquire(request_rec*);
8181

8282
/* acquire a connection that will have the lifetime of a connection
8383
* and MUST NOT be explicitly closed. Return NULL on error.
8484
* This is the preferred function for most applications.
8585
*/
86-
DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_cacquire(conn_rec*);
86+
DBD_DECLARE(ap_dbd_t*) ap_dbd_cacquire(conn_rec*);
8787

8888
/* Prepare a statement for use by a client module during
8989
* the server startup/configuration phase. Can't be called
9090
* after the server has created its children (use apr_dbd_*).
9191
*/
92-
DBD_DECLARE_NONSTD(void) ap_dbd_prepare(server_rec*, const char*, const char*);
92+
DBD_DECLARE(void) ap_dbd_prepare(server_rec*, const char*, const char*);
9393

9494
/* Also export them as optional functions for modules that prefer it */
9595
APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_open, (apr_pool_t*, server_rec*));

0 commit comments

Comments
 (0)