blead help for VMS

From: "Craig A. Berry" <craigberry@mac.com>
Message-ID: <42E3FABB.1020900@mac.com>
Date: Sun, 24 Jul 2005 15:31:55 -0500

p4raw-id: //depot/perl@25217

28 files changed, 33 insertions, 32 deletions

diff --git a/MANIFEST b/MANIFEST
index ecd5fd1164..288e149e95 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -170,28 +170,28 @@ ext/Compress/Zlib/t/04encoding.t	Compress::Zlib
 ext/Compress/Zlib/t/05gzsetp.t		Compress::Zlib
 ext/Compress/Zlib/t/06gzdopen.t		Compress::Zlib
 ext/Compress/Zlib/typemap		Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/adler32.c	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/compress.c	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/crc32.c	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/crc32.h	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/deflate.c	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/deflate.h	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/gzio.c		Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/infback.c	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/inffast.c	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/inffast.h	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/inffixed.h	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/inflate.c	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/inflate.h	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/inftrees.c	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/inftrees.h	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/trees.c	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/trees.h	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/uncompr.c	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/zconf.h	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/zlib.h		Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/zutil.c	Compress::Zlib
-ext/Compress/Zlib/zlib-src-1.2.3/zutil.h	Compress::Zlib
+ext/Compress/Zlib/zlib-src/adler32.c	Compress::Zlib
+ext/Compress/Zlib/zlib-src/compress.c	Compress::Zlib
+ext/Compress/Zlib/zlib-src/crc32.c	Compress::Zlib
+ext/Compress/Zlib/zlib-src/crc32.h	Compress::Zlib
+ext/Compress/Zlib/zlib-src/deflate.c	Compress::Zlib
+ext/Compress/Zlib/zlib-src/deflate.h	Compress::Zlib
+ext/Compress/Zlib/zlib-src/gzio.c		Compress::Zlib
+ext/Compress/Zlib/zlib-src/infback.c	Compress::Zlib
+ext/Compress/Zlib/zlib-src/inffast.c	Compress::Zlib
+ext/Compress/Zlib/zlib-src/inffast.h	Compress::Zlib
+ext/Compress/Zlib/zlib-src/inffixed.h	Compress::Zlib
+ext/Compress/Zlib/zlib-src/inflate.c	Compress::Zlib
+ext/Compress/Zlib/zlib-src/inflate.h	Compress::Zlib
+ext/Compress/Zlib/zlib-src/inftrees.c	Compress::Zlib
+ext/Compress/Zlib/zlib-src/inftrees.h	Compress::Zlib
+ext/Compress/Zlib/zlib-src/trees.c	Compress::Zlib
+ext/Compress/Zlib/zlib-src/trees.h	Compress::Zlib
+ext/Compress/Zlib/zlib-src/uncompr.c	Compress::Zlib
+ext/Compress/Zlib/zlib-src/zconf.h	Compress::Zlib
+ext/Compress/Zlib/zlib-src/zlib.h		Compress::Zlib
+ext/Compress/Zlib/zlib-src/zutil.c	Compress::Zlib
+ext/Compress/Zlib/zlib-src/zutil.h	Compress::Zlib
 ext/Data/Dumper/Changes		Data pretty printer, changelog
 ext/Data/Dumper/Dumper.pm	Data pretty printer, module
 ext/Data/Dumper/Dumper.xs	Data pretty printer, externals
diff --git a/ext/Compress/Zlib/config.in b/ext/Compress/Zlib/config.in
index 052e792f8a..638d0761bb 100755
--- a/ext/Compress/Zlib/config.in
+++ b/ext/Compress/Zlib/config.in
@@ -12,8 +12,8 @@
 # Compress::Zlib" in the README file for details of how to use this file.
 
 BUILD_ZLIB = True
-INCLUDE    = ./zlib-src-1.2.3
-LIB        = ./zlib-src-1.2.3
+INCLUDE    = ./zlib-src
+LIB        = ./zlib-src
 OLD_ZLIB   = False
 
 
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/adler32.c b/ext/Compress/Zlib/zlib-src/adler32.c
index 007ba26277..007ba26277 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/adler32.c
+++ b/ext/Compress/Zlib/zlib-src/adler32.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/compress.c b/ext/Compress/Zlib/zlib-src/compress.c
index df04f0148e..df04f0148e 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/compress.c
+++ b/ext/Compress/Zlib/zlib-src/compress.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/crc32.c b/ext/Compress/Zlib/zlib-src/crc32.c
index f658a9ef55..f658a9ef55 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/crc32.c
+++ b/ext/Compress/Zlib/zlib-src/crc32.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/crc32.h b/ext/Compress/Zlib/zlib-src/crc32.h
index 8053b6117c..8053b6117c 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/crc32.h
+++ b/ext/Compress/Zlib/zlib-src/crc32.h
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/deflate.c b/ext/Compress/Zlib/zlib-src/deflate.c
index 29ce1f64a5..29ce1f64a5 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/deflate.c
+++ b/ext/Compress/Zlib/zlib-src/deflate.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/deflate.h b/ext/Compress/Zlib/zlib-src/deflate.h
index 05a5ab3a2c..05a5ab3a2c 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/deflate.h
+++ b/ext/Compress/Zlib/zlib-src/deflate.h
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/gzio.c b/ext/Compress/Zlib/zlib-src/gzio.c
index 7e90f4928f..7e90f4928f 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/gzio.c
+++ b/ext/Compress/Zlib/zlib-src/gzio.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/infback.c b/ext/Compress/Zlib/zlib-src/infback.c
index 455dbc9ee8..455dbc9ee8 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/infback.c
+++ b/ext/Compress/Zlib/zlib-src/infback.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/inffast.c b/ext/Compress/Zlib/zlib-src/inffast.c
index bbee92ed1e..bbee92ed1e 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/inffast.c
+++ b/ext/Compress/Zlib/zlib-src/inffast.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/inffast.h b/ext/Compress/Zlib/zlib-src/inffast.h
index 1e88d2d97b..1e88d2d97b 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/inffast.h
+++ b/ext/Compress/Zlib/zlib-src/inffast.h
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/inffixed.h b/ext/Compress/Zlib/zlib-src/inffixed.h
index 75ed4b5978..75ed4b5978 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/inffixed.h
+++ b/ext/Compress/Zlib/zlib-src/inffixed.h
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/inflate.c b/ext/Compress/Zlib/zlib-src/inflate.c
index 792fdee8e9..792fdee8e9 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/inflate.c
+++ b/ext/Compress/Zlib/zlib-src/inflate.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/inflate.h b/ext/Compress/Zlib/zlib-src/inflate.h
index 07bd3e78a7..07bd3e78a7 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/inflate.h
+++ b/ext/Compress/Zlib/zlib-src/inflate.h
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/inftrees.c b/ext/Compress/Zlib/zlib-src/inftrees.c
index 8a9c13ff03..8a9c13ff03 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/inftrees.c
+++ b/ext/Compress/Zlib/zlib-src/inftrees.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/inftrees.h b/ext/Compress/Zlib/zlib-src/inftrees.h
index b1104c87e7..b1104c87e7 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/inftrees.h
+++ b/ext/Compress/Zlib/zlib-src/inftrees.h
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/trees.c b/ext/Compress/Zlib/zlib-src/trees.c
index 395e4e1681..395e4e1681 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/trees.c
+++ b/ext/Compress/Zlib/zlib-src/trees.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/trees.h b/ext/Compress/Zlib/zlib-src/trees.h
index 72facf900f..72facf900f 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/trees.h
+++ b/ext/Compress/Zlib/zlib-src/trees.h
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/uncompr.c b/ext/Compress/Zlib/zlib-src/uncompr.c
index b59e3d0def..b59e3d0def 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/uncompr.c
+++ b/ext/Compress/Zlib/zlib-src/uncompr.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/zconf.h b/ext/Compress/Zlib/zlib-src/zconf.h
index 03a9431c8b..03a9431c8b 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/zconf.h
+++ b/ext/Compress/Zlib/zlib-src/zconf.h
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/zlib.h b/ext/Compress/Zlib/zlib-src/zlib.h
index 022817927c..022817927c 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/zlib.h
+++ b/ext/Compress/Zlib/zlib-src/zlib.h
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/zutil.c b/ext/Compress/Zlib/zlib-src/zutil.c
index d55f5948a3..d55f5948a3 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/zutil.c
+++ b/ext/Compress/Zlib/zlib-src/zutil.c
diff --git a/ext/Compress/Zlib/zlib-src-1.2.3/zutil.h b/ext/Compress/Zlib/zlib-src/zutil.h
index b7d5eff81b..b7d5eff81b 100644
--- a/ext/Compress/Zlib/zlib-src-1.2.3/zutil.h
+++ b/ext/Compress/Zlib/zlib-src/zutil.h
diff --git a/mg.c b/mg.c
index f3e67204b3..fe78c208ce 100644
--- a/mg.c
+++ b/mg.c
@@ -1045,7 +1045,7 @@ Perl_magic_setenv(pTHX_ SV *sv, MAGIC *mg)
 	MgTAINTEDDIR_off(mg);
 #ifdef VMS
 	if (s && klen == 8 && strEQ(ptr, "DCL$PATH")) {
-	    char pathbuf[256], eltbuf[256], *cp, *elt = s;
+	    char pathbuf[256], eltbuf[256], *cp, *elt = (char *) s;
 	    Stat_t sbuf;
 	    int i = 0, j = 0;
 
diff --git a/pp_ctl.c b/pp_ctl.c
index dc91e6bbcf..b511b0ef40 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3143,7 +3143,7 @@ PP(pp_require)
 	I32 i;
 #ifdef VMS
 	char *unixname;
-	if ((unixname = tounixspec(name, Nullch)) != Nullch)
+	if ((unixname = tounixspec((char *)name, Nullch)) != Nullch)
 #endif
 	{
 	    namesv = NEWSV(806, 0);
@@ -3280,7 +3280,7 @@ PP(pp_require)
 #else
 #  ifdef VMS
 		    char *unixdir;
-		    if ((unixdir = tounixpath(dir, Nullch)) == Nullch)
+		    if ((unixdir = tounixpath((char *)dir, Nullch)) == Nullch)
 			continue;
 		    sv_setpv(namesv, unixdir);
 		    sv_catpv(namesv, unixname);
diff --git a/pp_sys.c b/pp_sys.c
index 77613cb288..4ca140f077 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -3607,7 +3607,7 @@ PP(pp_chdir)
 #endif
     }
     else 
-        PUSHi( PerlDir_chdir(tmps) >= 0 );
+        PUSHi( PerlDir_chdir((char *)tmps) >= 0 );
 #ifdef VMS
     /* Clear the DEFAULT element of ENV so we'll get the new value
      * in the future. */
@@ -3878,7 +3878,7 @@ PP(pp_mkdir)
 
     TAINT_PROPER("mkdir");
 #ifdef HAS_MKDIR
-    SETi( PerlDir_mkdir(tmps, mode) >= 0 );
+    SETi( PerlDir_mkdir((char *)tmps, mode) >= 0 );
 #else
     SETi( dooneliner("mkdir", tmps) );
     oldumask = PerlLIO_umask(0);
@@ -3900,7 +3900,7 @@ PP(pp_rmdir)
     TRIMSLASHES(tmps,len,copy);
     TAINT_PROPER("rmdir");
 #ifdef HAS_RMDIR
-    SETi( PerlDir_rmdir(tmps) >= 0 );
+    SETi( PerlDir_rmdir((char *)tmps) >= 0 );
 #else
     SETi( dooneliner("rmdir", tmps) );
 #endif
@@ -3924,7 +3924,7 @@ PP(pp_open_dir)
 
     if (IoDIRP(io))
 	PerlDir_close(IoDIRP(io));
-    if (!(IoDIRP(io) = PerlDir_open(dirname)))
+    if (!(IoDIRP(io) = PerlDir_open((char *)dirname)))
 	goto nope;
 
     RETPUSHYES;
diff --git a/vms/gen_shrfls.pl b/vms/gen_shrfls.pl
index 50ae3e3e8a..6fb1bb9d00 100644
--- a/vms/gen_shrfls.pl
+++ b/vms/gen_shrfls.pl
@@ -152,7 +152,8 @@ sub scan_func {
   $line =~ s/\b(IV|Off_t|Size_t|SSize_t|void)\b//i;
   if ( $line =~ /(\w+)\s*\(/ ) {
     print "\troutine name is \\$1\\\n" if $debug > 1;
-    if ($1 eq 'main' || $1 eq 'perl_init_ext' || $1 eq '__attribute__format__') {
+    if ($1 eq 'main' || $1 eq 'perl_init_ext' || $1 eq '__attribute__format__'
+        || (($1 eq 'Perl_stashpv_hvname_match') && ! $use_threads)) {
       print "\tskipped\n" if $debug > 1;
     }
     else { $fcns{$1}++ }