Fix prototypes in perlapi.c (64-bit?)

       Clear prior definition of getenv_len before defining VMS-specific macro

p4raw-id: //depot/vmsperl@4026

2 files changed, 6 insertions, 3 deletions

diff --git a/perlapi.c b/perlapi.c
index 192428bf3f..d0c7f337d8 100755
--- a/perlapi.c
+++ b/perlapi.c
@@ -3492,14 +3492,14 @@ Perl_scalarvoid(pTHXo_ OP* o)
 }
 
 #undef  Perl_scan_bin
-UV
+NV
 Perl_scan_bin(pTHXo_ char* start, I32 len, I32* retlen)
 {
     return ((CPerlObj*)pPerl)->Perl_scan_bin(start, len, retlen);
 }
 
 #undef  Perl_scan_hex
-UV
+NV
 Perl_scan_hex(pTHXo_ char* start, I32 len, I32* retlen)
 {
     return ((CPerlObj*)pPerl)->Perl_scan_hex(start, len, retlen);
@@ -3513,7 +3513,7 @@ Perl_scan_num(pTHXo_ char* s)
 }
 
 #undef  Perl_scan_oct
-UV
+NV
 Perl_scan_oct(pTHXo_ char* start, I32 len, I32* retlen)
 {
     return ((CPerlObj*)pPerl)->Perl_scan_oct(start, len, retlen);
diff --git a/vms/vmsish.h b/vms/vmsish.h
index 17aac8a665..261a506987 100644
--- a/vms/vmsish.h
+++ b/vms/vmsish.h
@@ -75,6 +75,9 @@
   /* getenv used for regular logical names */
 #  define getenv(v) my_getenv(v,TRUE)
 #endif
+#ifdef getenv_len
+#  undef getenv_len
+#endif
 #define getenv_len(v,l) my_getenv_len(v,l,TRUE)
 
 /* DECC introduces this routine in the RTL as of VMS 7.0; for now,