richter 2002/10/08 13:11:42
Modified: . Tag: Embperl2c Changes.pod Embperl.xs Makefile.PL
ep.h epcmd2.c epmain.c
driver Tag: Embperl2c eplibxslt.c
Log:
fix perl 5.8.0 compiler errors and warnings
Revision Changes Path
No revision
No revision
1.129.4.94 +1 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.93
retrieving revision 1.129.4.94
diff -u -r1.129.4.93 -r1.129.4.94
--- Changes.pod 24 Sep 2002 04:34:52 -0000 1.129.4.93
+++ Changes.pod 8 Oct 2002 20:11:40 -0000 1.129.4.94
@@ -23,6 +23,7 @@
was not setup
- Added 'same' validation to check if two fileds have the same input enterd
- Fix memory leak. Patch from Joshua Chamas.
+ - Use MP_AP_PREFIX as source for APache 2. Patch from Paul Dyer.
=head1 2.0b8 (BETA) 25. Juni 2002
1.29.4.54 +1 -2 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.53
retrieving revision 1.29.4.54
diff -u -r1.29.4.53 -r1.29.4.54
--- Embperl.xs 28 May 2002 06:56:03 -0000 1.29.4.53
+++ Embperl.xs 8 Oct 2002 20:11:40 -0000 1.29.4.54
@@ -18,9 +18,8 @@
/* for embperl_exit */
-static IV errgv_empty_set(IV ix, SV * sv)
+static IV errgv_empty_set(pTHX_ IV ix, SV * sv)
{
- dTHX ;
sv_setsv(sv, &sv_undef);
return TRUE;
}
1.31.4.59 +2 -2 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.58
retrieving revision 1.31.4.59
diff -u -r1.31.4.58 -r1.31.4.59
--- Makefile.PL 25 Jun 2002 07:05:25 -0000 1.31.4.58
+++ Makefile.PL 8 Oct 2002 20:11:40 -0000 1.31.4.59
@@ -513,7 +513,7 @@
if ($@ eq '')
{
$mp2cfg = Apache::BuildConfig -> new ;
- $apache_src = $mp2cfg -> {APXS_INCLUDEDIR} ;
+ $apache_src = $mp2cfg -> {MP_AP_PREFIX} ;
print "Found mod_perl 2.0\n" ;
}
else
1.27.4.49 +10 -6 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.27.4.48
retrieving revision 1.27.4.49
diff -u -r1.27.4.48 -r1.27.4.49
--- ep.h 1 Jul 2002 06:57:12 -0000 1.27.4.48
+++ ep.h 8 Oct 2002 20:11:40 -0000 1.27.4.49
@@ -21,7 +21,16 @@
#include <ctype.h>
#include <time.h>
-#if !defined(PERLIO_IS_STDIO)
+#ifndef PERL_VERSION
+#include <patchlevel.h>
+#ifndef PERL_VERSION
+#define PERL_VERSION PATCHLEVEL
+#define PERL_SUBVERSION SUBVERSION
+#endif
+#endif
+
+
+#if !defined(PERLIO_IS_STDIO) && PERL_VERSION < 8
#define PERLIO_IS_STDIO
#endif
@@ -101,11 +110,6 @@
#undef sleep
#endif
-#ifndef PERL_VERSION
-#include <patchlevel.h>
-#define PERL_VERSION PATCHLEVEL
-#define PERL_SUBVERSION SUBVERSION
-#endif
#if PERL_VERSION >= 6
1.4.2.22 +4 -4 embperl/Attic/epcmd2.c
Index: epcmd2.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcmd2.c,v
retrieving revision 1.4.2.21
retrieving revision 1.4.2.22
diff -u -r1.4.2.21 -r1.4.2.22
--- epcmd2.c 8 Apr 2002 03:39:09 -0000 1.4.2.21
+++ epcmd2.c 8 Oct 2002 20:11:40 -0000 1.4.2.22
@@ -411,7 +411,7 @@
if (ppSV && *ppSV)
{
s = SV2String (*ppSV, l) ;
- xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild,
nRepeatLevel, (r -> Component.nCurrEscMode & 3)?ntypTextHTML:ntypCDATA, 0, s, l, 0, 0,
NULL) ;
+ xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild,
nRepeatLevel, (tNodeType)((r -> Component.nCurrEscMode & 3)?ntypTextHTML:ntypCDATA),
0, s, l, 0, 0, NULL) ;
if (r -> Component.nCurrEscMode & 2)
Node_selfLevel (r -> pApp, pDomTree, xNode, nRepeatLevel) ->
bFlags |= nflgEscUrl ;
}
@@ -442,7 +442,7 @@
if (i++ > 0)
Node_appendChild (r -> pApp, pDomTree, xOldChild, nRepeatLevel,
ntypCDATA, 0, "&", 5, 0, 0, NULL) ;
pKey = hv_iterkey (pEntry, &l32) ;
- xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild, nRepeatLevel,
(r -> Component.nCurrEscMode & 3)?ntypTextHTML:ntypCDATA, 0, pKey, l32, 0, 0, NULL) ;
+ xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild, nRepeatLevel,
(tNodeType)((r -> Component.nCurrEscMode & 3)?ntypTextHTML:ntypCDATA), 0, pKey, l32,
0, 0, NULL) ;
if (r -> Component.nCurrEscMode & 2)
Node_self (pDomTree, xNode) -> bFlags |= nflgEscUrl ;
@@ -452,7 +452,7 @@
if (pSVValue)
{
s = SV2String (pSVValue, l) ;
- xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild,
nRepeatLevel, (r -> Component.nCurrEscMode & 3)?ntypTextHTML:ntypCDATA, 0, s, l, 0, 0,
NULL) ;
+ xNode = Node_appendChild (r -> pApp, pDomTree, xOldChild,
nRepeatLevel, (tNodeType)((r -> Component.nCurrEscMode & 3)?ntypTextHTML:ntypCDATA),
0, s, l, 0, 0, NULL) ;
if (r -> Component.nCurrEscMode & 2)
Node_selfLevel (r -> pApp, pDomTree, xNode, nRepeatLevel) ->
bFlags |= nflgEscUrl ;
}
1.75.4.126 +3 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.125
retrieving revision 1.75.4.126
diff -u -r1.75.4.125 -r1.75.4.126
--- epmain.c 24 Jun 2002 19:22:29 -0000 1.75.4.125
+++ epmain.c 8 Oct 2002 20:11:40 -0000 1.75.4.126
@@ -255,7 +255,8 @@
#endif
{
PerlIO_printf (PerlIO_stderr(), "%s\n", sText) ;
- fflush (stderr) ;
+ /* fflush (stderr) ; */
+ PerlIO_flush (PerlIO_stderr()) ;
}
if (r)
No revision
No revision
1.1.2.24 +3 -3 embperl/driver/Attic/eplibxslt.c
Index: eplibxslt.c
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/eplibxslt.c,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- eplibxslt.c 21 Aug 2002 05:48:54 -0000 1.1.2.23
+++ eplibxslt.c 8 Oct 2002 20:11:41 -0000 1.1.2.24
@@ -139,7 +139,7 @@
xmlSubstituteEntitiesDefault(1);
xmlLoadExtDtdDefaultValue = 1;
- xmlSetGenericErrorFunc (stderr, NULL) ;
+ /* xmlSetGenericErrorFunc (stderr, NULL) ; */
cur = xsltParseStylesheetFile((const xmlChar *)sStylesheet);
p = SvPV (pSource, len) ;
@@ -259,7 +259,7 @@
va_end(args) ;
if (!r)
- fputs (SvPV(pSV, l), stderr) ;
+ PerlIO_puts (PerlIO_stderr(), SvPV(pSV, l)) ;
else
{
char * p = SvPV(pSV, l) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
