randyk 2004/10/01 20:15:37
Modified: src/modules/perl mod_perl.h modperl_common_util.h
Log:
Reviewed by: stas
Introduce MP_FUNC_NONSTD_T, which differs from MP_FUNC_T on Win32
by the absence of _stdcall, and use it defining modperl_var_modify_t.
Revision Changes Path
1.71 +4 -4 modperl-2.0/src/modules/perl/mod_perl.h
Index: mod_perl.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- mod_perl.h 20 Sep 2004 18:14:47 -0000 1.70
+++ mod_perl.h 2 Oct 2004 03:15:36 -0000 1.71
@@ -130,10 +130,10 @@
#define MgTypeExt(mg) (mg->mg_type == '~')
-typedef void MP_FUNC_T(modperl_var_modify_t) (apr_table_t *,
- apr_table_t *,
- const char *,
- const char *);
+typedef void MP_FUNC_NONSTD_T(modperl_var_modify_t) (apr_table_t *,
+ apr_table_t *,
+ const char *,
+ const char *);
/* we need to hook a few internal things before APR_HOOK_REALLY_FIRST */
#define MODPERL_HOOK_REALLY_REALLY_FIRST (-20)
1.4 +3 -1 modperl-2.0/src/modules/perl/modperl_common_util.h
Index: modperl_common_util.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_common_util.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modperl_common_util.h 15 Jul 2004 06:23:20 -0000 1.3
+++ modperl_common_util.h 2 Oct 2004 03:15:36 -0000 1.4
@@ -26,7 +26,8 @@
#endif
#ifdef WIN32
-# define MP_FUNC_T(name) (_stdcall *name)
+# define MP_FUNC_T(name) (_stdcall *name)
+# define MP_FUNC_NONSTD_T(name) (*name)
/* XXX: not all functions get inlined
* so its unclear what to and not to include in the .def files
*/
@@ -34,6 +35,7 @@
# define MP_INLINE
#else
# define MP_FUNC_T(name) (*name)
+# define MP_FUNC_NONSTD_T(name) (*name)
#endif
