You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by st...@apache.org on 2004/10/19 01:19:13 UTC
cvs commit: modperl-2.0/src/modules/perl modperl_config.h
stas 2004/10/18 16:19:13
Modified: src/modules/perl modperl_config.h
Log:
align macros (no code change)
Revision Changes Path
1.36 +35 -35 modperl-2.0/src/modules/perl/modperl_config.h
Index: modperl_config.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -u -r1.35 -r1.36
--- modperl_config.h 9 Sep 2004 22:39:11 -0000 1.35
+++ modperl_config.h 18 Oct 2004 23:19:13 -0000 1.36
@@ -32,72 +32,72 @@
char **modperl_config_srv_argv_init(modperl_config_srv_t *scfg, int *argc);
-#define modperl_config_srv_argv_push(arg) \
+#define modperl_config_srv_argv_push(arg) \
*(const char **)apr_array_push(scfg->argv) = arg
apr_status_t modperl_config_request_cleanup(pTHX_ request_rec *r);
apr_status_t modperl_config_req_cleanup(void *data);
-#define modperl_config_req_cleanup_register(r, rcfg) \
- if (r && !MpReqCLEANUP_REGISTERED(rcfg)) { \
- apr_pool_cleanup_register(r->pool, \
- (void*)r, \
- modperl_config_req_cleanup, \
- apr_pool_cleanup_null); \
- MpReqCLEANUP_REGISTERED_On(rcfg); \
+#define modperl_config_req_cleanup_register(r, rcfg) \
+ if (r && !MpReqCLEANUP_REGISTERED(rcfg)) { \
+ apr_pool_cleanup_register(r->pool, \
+ (void*)r, \
+ modperl_config_req_cleanup, \
+ apr_pool_cleanup_null); \
+ MpReqCLEANUP_REGISTERED_On(rcfg); \
}
void *modperl_get_perl_module_config(ap_conf_vector_t *cv);
void modperl_set_perl_module_config(ap_conf_vector_t *cv, void *cfg);
#if defined(MP_IN_XS) && defined(WIN32)
-# define modperl_get_module_config(v) \
- modperl_get_perl_module_config(v)
+# define modperl_get_module_config(v) \
+ modperl_get_perl_module_config(v)
-# define modperl_set_module_config(v, c) \
- modperl_set_perl_module_config(v, c)
+# define modperl_set_module_config(v, c) \
+ modperl_set_perl_module_config(v, c)
#else
-# define modperl_get_module_config(v) \
- ap_get_module_config(v, &perl_module)
+# define modperl_get_module_config(v) \
+ ap_get_module_config(v, &perl_module)
-# define modperl_set_module_config(v, c) \
- ap_set_module_config(v, &perl_module, c)
+# define modperl_set_module_config(v, c) \
+ ap_set_module_config(v, &perl_module, c)
#endif
-#define modperl_config_req_init(r, rcfg) \
- if (!rcfg) { \
- rcfg = modperl_config_req_new(r); \
+#define modperl_config_req_init(r, rcfg) \
+ if (!rcfg) { \
+ rcfg = modperl_config_req_new(r); \
modperl_set_module_config(r->request_config, rcfg); \
}
-#define modperl_config_req_get(r) \
- (r ? (modperl_config_req_t *) \
- modperl_get_module_config(r->request_config) : NULL)
+#define modperl_config_req_get(r) \
+ (r ? (modperl_config_req_t *) \
+ modperl_get_module_config(r->request_config) : NULL)
#define MP_dRCFG \
modperl_config_req_t *rcfg = modperl_config_req_get(r)
-#define modperl_config_dir_get(r) \
- (r ? (modperl_config_dir_t *) \
- modperl_get_module_config(r->per_dir_config) : NULL)
+#define modperl_config_dir_get(r) \
+ (r ? (modperl_config_dir_t *) \
+ modperl_get_module_config(r->per_dir_config) : NULL)
-#define modperl_config_dir_get_defaults(s) \
- (modperl_config_dir_t *) \
+#define modperl_config_dir_get_defaults(s) \
+ (modperl_config_dir_t *) \
modperl_get_module_config(s->lookup_defaults)
#define MP_dDCFG \
modperl_config_dir_t *dcfg = modperl_config_dir_get(r)
-#define modperl_config_srv_get(s) \
- (modperl_config_srv_t *) \
+#define modperl_config_srv_get(s) \
+ (modperl_config_srv_t *) \
modperl_get_module_config(s->module_config)
-#define MP_dSCFG(s) \
- modperl_config_srv_t *scfg = modperl_config_srv_get(s)
+#define MP_dSCFG(s) \
+ modperl_config_srv_t *scfg = modperl_config_srv_get(s)
#ifdef USE_ITHREADS
-# define MP_dSCFG_dTHX \
+# define MP_dSCFG_dTHX \
dTHXa(scfg->mip->parent->perl); \
PERL_SET_CONTEXT(aTHX)
#else
@@ -106,9 +106,9 @@
/* hopefully this macro will not need to be used often */
#ifdef USE_ITHREADS
-# define MP_dTHX \
- modperl_interp_t *interp = \
- modperl_interp_select(r, r->connection, r->server); \
+# define MP_dTHX \
+ modperl_interp_t *interp = \
+ modperl_interp_select(r, r->connection, r->server); \
dTHXa(interp->perl)
#else
# define MP_dTHX dNOOP