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 do...@apache.org on 2002/05/10 19:48:27 UTC
cvs commit: modperl-2.0/xs/maps modperl_functions.map
dougm 02/05/10 10:48:27
Modified: src/modules/perl modperl_util.c
xs/Apache/RequestIO Apache__RequestIO.h
xs/maps modperl_functions.map
Log:
win32 is not happy with PL_sv_no; dont use it.
Revision Changes Path
1.39 +1 -1 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- modperl_util.c 9 Apr 2002 02:59:19 -0000 1.38
+++ modperl_util.c 10 May 2002 17:48:27 -0000 1.39
@@ -559,7 +559,7 @@
retval = modperl_hash_tie(aTHX_ "APR::Table",
Nullsv, (void*)table);
}
- else if (sv_val == &PL_sv_no) { /* no val was passed */
+ else if (!sv_val) { /* no val was passed */
char *val;
if ((val = (char *)apr_table_get(table, key))) {
retval = newSVpv(val, 0);
1.26 +11 -2 modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h
Index: Apache__RequestIO.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Apache__RequestIO.h 8 Jan 2002 22:48:38 -0000 1.25
+++ Apache__RequestIO.h 10 May 2002 17:48:27 -0000 1.26
@@ -1,13 +1,22 @@
+#ifdef WIN32
+/* win32 not happy with &PL_sv_no */
+# define SVNO newSViv(0)
+# define SVYES newSViv(1)
+#else
+# define SVNO &PL_sv_no
+# define SVYES &PL_sv_yes
+#endif
+
#define mpxs_Apache__RequestRec_TIEHANDLE(stashsv, sv) \
modperl_newSVsv_obj(aTHX_ stashsv, sv)
#define mpxs_Apache__RequestRec_PRINT mpxs_Apache__RequestRec_print
#define mpxs_Apache__RequestRec_PRINTF mpxs_ap_rprintf
#define mpxs_Apache__RequestRec_BINMODE(r) \
- r ? &PL_sv_yes : &PL_sv_no /* noop */
+ r ? SVYES : SVNO /* noop */
#define mpxs_Apache__RequestRec_UNTIE(r, refcnt) \
- (r && refcnt) ? &PL_sv_yes : &PL_sv_no /* noop */
+ (r && refcnt) ? SVYES : SVNO /* noop */
#define mpxs_output_flush(r, rcfg) \
/* if ($|) */ \
1.36 +2 -2 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- modperl_functions.map 29 Jan 2002 17:11:06 -0000 1.35
+++ modperl_functions.map 10 May 2002 17:48:27 -0000 1.36
@@ -21,7 +21,7 @@
mpxs_Apache__RequestRec_no_cache | | r, flag=Nullsv
PACKAGE=Apache::RequestRec
mpxs_Apache__RequestRec_new | | classname, c, base_pool=NULL
- SV *:DEFINE_dir_config | | request_rec *:r, char *:key=NULL, SV *:sv_val=&PL_sv_no
+ SV *:DEFINE_dir_config | | request_rec *:r, char *:key=NULL, SV *:sv_val=Nullsv
PACKAGE=Apache
mpxs_Apache_request | | classname, svr=Nullsv
@@ -52,7 +52,7 @@
mpxs_Apache__Server_get_handlers
PACKAGE=Apache::Server
- SV *:DEFINE_dir_config | | server_rec *:s, char *:key=NULL, SV *:sv_val=&PL_sv_no
+ SV *:DEFINE_dir_config | | server_rec *:s, char *:key=NULL, SV *:sv_val=Nullsv
PACKAGE=Apache
server_rec *:DEFINE_server | | SV *:classname=Nullsv