Fixes to compile Perl with g++ and DEBUGGING.

p4raw-id: //depot/perl@28934

diff --git a/regcomp.pl b/regcomp.pl
index 2884971..ed270e8 100644 (file)
--- a/regcomp.pl
+++ b/regcomp.pl
@@ -152,7 +152,7 @@ print OUT <<EOP;
 };
 
 #ifdef DEBUGGING
-const char * const reg_name[] = {
+const char * reg_name[] = {
 EOP
 
 $ind = 0;
@@ -170,7 +170,7 @@ print OUT <<EOP;
 #endif /* DEBUGGING */
 #else
 #ifdef DEBUGGING
-extern const char * const reg_name[];
+extern const char * reg_name[];
 #endif
 #endif /* REG_COMP_C */
 

diff --git a/regnodes.h b/regnodes.h
index 31286f9..01a53f9 100644 (file)
--- a/regnodes.h
+++ b/regnodes.h
@@ -347,7 +347,7 @@ static const char reg_off_by_arg[] = {
 };
 
 #ifdef DEBUGGING
-const char * const reg_name[] = {
+const char * reg_name[] = {
        "END",                          /* 0000 */
        "SUCCEED",                      /* 0x01 */
        "BOL",                          /* 0x02 */
@@ -445,7 +445,7 @@ const char * const reg_name[] = {
 #endif /* DEBUGGING */
 #else
 #ifdef DEBUGGING
-extern const char * const reg_name[];
+extern const char * reg_name[];
 #endif
 #endif /* REG_COMP_C */
 

diff --git a/x2p/a2p.c b/x2p/a2p.c
index 1098b1e..9d1d172 100644 (file)
--- a/x2p/a2p.c
+++ b/x2p/a2p.c
@@ -2179,13 +2179,17 @@ int yyparse (void);
 #define YYREJECT goto yyabort
 #define YYACCEPT goto yyaccept
 #define YYERROR goto yyerrlab
+
+#if YYDEBUG
+EXTERN_C char *getenv(const char *);
+#endif
+
 int
 yyparse(void)
 {
     register int yym, yyn, yystate;
 #if YYDEBUG
     register char *yys;
-    extern char *getenv();
 
     if ((yys = getenv("YYDEBUG")))
     {