/[Apache-SVN]/httpd/httpd/trunk/modules/database/mod_dbd.c
ViewVC logotype

Diff of /httpd/httpd/trunk/modules/database/mod_dbd.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 664080, Fri Jun 6 18:56:13 2008 UTC revision 664160, Fri Jun 6 22:21:07 2008 UTC
# Line 277  static int dbd_pre_config(apr_pool_t *pc Line 277  static int dbd_pre_config(apr_pool_t *pc
277     return OK;     return OK;
278  }  }
279    
280  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,
281                                   const char *label)                                   const char *label)
282  {  {
283      svr_cfg *svr;      svr_cfg *svr;
# Line 687  static apr_status_t dbd_setup_lock(serve Line 687  static apr_status_t dbd_setup_lock(serve
687          - open acquires a connection from the pool (opens one if necessary)          - open acquires a connection from the pool (opens one if necessary)
688          - close releases it back in to the pool          - close releases it back in to the pool
689  */  */
690  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)
691  {  {
692      svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);      svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
693    
# Line 725  static apr_status_t dbd_check(apr_pool_t Line 725  static apr_status_t dbd_check(apr_pool_t
725      return rv;      return rv;
726  }  }
727    
728  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)
729  {  {
730      svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);      svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
731      dbd_group_t *group = svr->group;      dbd_group_t *group = svr->group;
# Line 804  static apr_status_t dbd_release(void *da Line 804  static apr_status_t dbd_release(void *da
804      return APR_SUCCESS;      return APR_SUCCESS;
805  }  }
806    
807  DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)  DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
808  {  {
809      dbd_acquire_t *acq;      dbd_acquire_t *acq;
810    
# Line 837  DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(r Line 837  DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(r
837      return acq->rec;      return acq->rec;
838  }  }
839    
840  DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)  DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
841  {  {
842      dbd_acquire_t *acq = ap_get_module_config(c->conn_config, &dbd_module);      dbd_acquire_t *acq = ap_get_module_config(c->conn_config, &dbd_module);
843    
# Line 860  DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire( Line 860  DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire(
860      return acq->rec;      return acq->rec;
861  }  }
862  #else  #else
863  DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(request_rec *r)  DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_acquire(request_rec *r)
864  {  {
865      ap_dbd_t *rec;      ap_dbd_t *rec;
866    
# Line 884  DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(r Line 884  DBD_DECLARE(ap_dbd_t *) ap_dbd_acquire(r
884      return rec;      return rec;
885  }  }
886    
887  DBD_DECLARE(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)  DBD_DECLARE_NONSTD(ap_dbd_t *) ap_dbd_cacquire(conn_rec *c)
888  {  {
889      ap_dbd_t *rec = ap_get_module_config(c->conn_config, &dbd_module);      ap_dbd_t *rec = ap_get_module_config(c->conn_config, &dbd_module);
890    

Legend:
Removed from v.664080  
changed lines
  Added in v.664160

apache@apache.org
ViewVC Help
Powered by ViewVC 1.1.2