x2p: getenv() prototype wrong both for C89 and C++

--- a2p.c.dist	2007-04-17 14:11:43.000000000 +0300
+++ a2p.c	2007-04-18 05:54:26.000000000 +0300
 -2185,7
+2185,9 
     register int yym, yyn, yystate;
 #if YYDEBUG
     register char *yys;
-    extern char *getenv();
+#ifndef __cplusplus
+    extern char *getenv(const char *);
+#endif
 
     if ((yys = getenv("YYDEBUG")))
     {
--- Makefile.SH.dist	2007-04-17 14:11:35.000000000 +0300
+++ Makefile.SH	2007-04-18 05:57:38.000000000 +0300
 -119,6
+119,10 
 	$(BYACC) a2p.y
 	rm -f a2p.c
 	sed -e 's/(yyn = yydefred[yystate])/((yyn =
yydefred[yystate]))/' 
+	    -e '/^    extern char *getenv();/ c
+#ifndef __cpluscplus
+    extern char *getenv(const char *);
+#endif' 
 	    -e 's/(yys = getenv("YYDEBUG"))/((yys =
getenv("YYDEBUG")))/' 
 	    -e 's/^yyerrlab://' 
 	    -e 's/^    goto yyerrlab;//' 

On Wed, 18 Apr 2007 05:58:27 +0300 (EEST), Jarkko Hietaniemi
<jhicc.hut.fi>
wrote:

1. Against which version of perl is this?
2. Can you include something like perl/x2s/ in the file
names?
   There are several Makefile.SH's in the perl core distro.

patching file perl/x2p/a2p.c
Hunk #1 FAILED at 2185.
1 out of 1 hunk FAILED -- saving rejects to file
perl/x2p/a2p.c.rej
patching file perl/x2p/Makefile.SH
Hunk #1 succeeded at 116 (offset -3 lines).

Just doesn't feel comfortable enough to apply.

> --- a2p.c.dist	2007-04-17 14:11:43.000000000 +0300
> +++ a2p.c	2007-04-18 05:54:26.000000000 +0300
>  -2185,7 +2185,9 
>      register int yym, yyn, yystate;
>  #if YYDEBUG
>      register char *yys;
> -    extern char *getenv();
> +#ifndef __cplusplus
> +    extern char *getenv(const char *);
> +#endif
>  
>      if ((yys = getenv("YYDEBUG")))
>      {
> --- Makefile.SH.dist	2007-04-17 14:11:35.000000000
+0300
> +++ Makefile.SH	2007-04-18 05:57:38.000000000 +0300
>  -119,6 +119,10 
>  	$(BYACC) a2p.y
>  	rm -f a2p.c
>  	sed -e 's/(yyn = yydefred[yystate])/((yyn =
yydefred[yystate]))/' 
> +	    -e '/^    extern char *getenv();/ c
> +#ifndef __cpluscplus
> +    extern char *getenv(const char *);
> +#endif' 
>  	    -e 's/(yys = getenv("YYDEBUG"))/((yys =
getenv("YYDEBUG")))/' 
>  	    -e 's/^yyerrlab://' 
>  	    -e 's/^    goto yyerrlab;//' 
> 


-- 
H.Merijn Brand         Amsterdam Perl Mongers (http://amsterdam.pm.org/
)
using & porting perl 5.6.2, 5.8.x, 5.9.x   on HP-UX
10.20, 11.00, 11.11,
& 11.23, SuSE 10.0 & 10.2, AIX 4.3 & 5.2, and
Cygwin. http://qa.perl.org
http://mirrors.de
velooper.com/hpux/            http://www.test-smoke.org
                        http
://www.goldmark.org/jeff/stupid-disclaimers/