os390 fixes (suggested by Peter Prymmer)

p4raw-id: //depot/perl@1921

diff --git a/Makefile.SH b/Makefile.SH
index 9f489f5..c51b542 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -665,7 +665,22 @@ $define)
         echo "perly.y -> perly.c" >&2
         mv -f y.tab.c perly.c
         chmod u+w perly.c
-        sed -e 's/fprintf *( *stderr *,/PerlIO_printf(Perl_debug_log,/g' \
+        sed -e '/^#include "perl\.h"/a\
+\
+#define yydebug    PL_yydebug\
+#define yynerrs    PL_yynerrs\
+#define yyerrflag  PL_yyerrflag\
+#define yychar     PL_yychar\
+#define yyssp      PL_yyssp\
+#define yyvsp      PL_yyvsp\
+#define yyval      PL_yyval\
+#define yylval     PL_yylval'                          \
+            -e '/YYSTYPE *yyval;/D'                    \
+            -e '/YYSTYPE *yylval;/D'                   \
+            -e '/int  yychar,/,/yynerrs;/D'            \
+            -e 's/int yydebug = 0;/yydebug = 0;/'      \
+            -e 's/[^_]realloc(/PerlMem_realloc(/g'     \
+            -e 's/fprintf *( *stderr *,/PerlIO_printf(Perl_debug_log,/g' \
             -e 's/y\.tab/perly/g' perly.c >perly.tmp && mv perly.tmp perly.c
         xxx="$xxx perly.c"
     fi

diff --git a/regcomp.c b/regcomp.c
index 583e14c..8b05552 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -2270,7 +2270,9 @@ regclass(void)
        if (!SIZE_ONLY) {
 #ifndef ASCIIish
            if ((isLOWER(lastvalue) && isLOWER(value)) ||
-               (isUPPER(lastvalue) && isUPPER(value))) {
+               (isUPPER(lastvalue) && isUPPER(value)))
+           {
+               I32 i;
                if (isLOWER(lastvalue)) {
                    for (i = lastvalue; i <= value; i++)
                        if (isLOWER(i))