Merge maint-5.004 branch (5.004_01) with mainline.

p4raw-id: //depot/perl@84

4 files changed, 15 insertions, 10 deletions

diff --git a/vms/ext/DCLsym/DCLsym.pm b/vms/ext/DCLsym/DCLsym.pm
index 057951dd99..44c4b84a65 100644
--- a/vms/ext/DCLsym/DCLsym.pm
+++ b/vms/ext/DCLsym/DCLsym.pm
@@ -201,6 +201,8 @@ can also call methods directly to manipulate individual symbols.  In some
 cases, this allows you finer control than using a tied hash aggregate.  The
 following methods are supported:
 
+=over
+
 =item new
 
 This creates a C<VMS::DCLsym> object which can be used as a handle for later
diff --git a/vms/ext/Stdio/Stdio.pm b/vms/ext/Stdio/Stdio.pm
index 516e678e2c..218c406fa4 100644
--- a/vms/ext/Stdio/Stdio.pm
+++ b/vms/ext/Stdio/Stdio.pm
@@ -76,7 +76,7 @@ __END__
 
 =head1 NAME
 
-VMS::Stdio
+VMS::Stdio - standard I/O functions via VMS extensions
 
 =head1 SYNOPSIS
 
@@ -99,7 +99,7 @@ remove("another.file");
 
 =head1 DESCRIPTION
 
-This package gives Perl scripts access to VMS extensions to several
+This package gives Perl scripts access via VMS extensions to several
 C stdio operations not available through Perl's CORE I/O functions.
 The specific routines are described below.  These functions are
 prototyped as unary operators, with the exception of C<vmsopen>
@@ -141,6 +141,8 @@ VMS::Stdio function.  This compatibility interface will be
 removed in a future release of this extension, so please
 update your code to use the new routines.
 
+=over
+
 =item flush
 
 This function causes the contents of stdio buffers for the specified
diff --git a/vms/gen_shrfls.pl b/vms/gen_shrfls.pl
index cb4f7dd1f1..e451e1826b 100644
--- a/vms/gen_shrfls.pl
+++ b/vms/gen_shrfls.pl
@@ -145,7 +145,8 @@ sub scan_var {
   my($const) = $line =~ /^EXTCONST/;
 
   print "\tchecking for global variable\n" if $debug > 1;
-  $line =~ s/INIT\(.*\)//;
+  $line =~ s/\s*EXT/EXT/;
+  $line =~ s/INIT\s*\(.*\)//;
   $line =~ s/\[.*//;
   $line =~ s/=.*//;
   $line =~ s/\W*;?\s*$//;
@@ -156,7 +157,7 @@ sub scan_var {
    else        { $vars{$1}++;  }
   }
   if ($isvaxc) {
-    my($type) = $line =~ /^EXT\w*\s+(\w+)/;
+    my($type) = $line =~ /^\s*EXT\w*\s+(\w+)/;
     print "\tchecking for use of enum (type is \"$type\")\n" if $debug > 2;
     if ($type eq 'expectation') {
       $used_expectation_enum++;
@@ -194,18 +195,18 @@ LINE: while (<CPP>) {
   while (/^#.*vmsish\.h/i .. /^#.*perl\.h/i) {
     while (/__VMS_PROTOTYPES__/i .. /__VMS_SEPYTOTORP__/i) {
       print "vms_proto>> $_" if $debug > 2;
-      if (/^EXT/) { &scan_var($_);  }
+      if (/^\s*EXT/) { &scan_var($_);  }
       else        { &scan_func($_); }
       last LINE unless $_ = <CPP>;
     }
     print "vmsish.h>> $_" if $debug > 2;
-    if (/^EXT/) { &scan_var($_); }
+    if (/^\s*EXT/) { &scan_var($_); }
     last LINE unless $_ = <CPP>;
   }    
   while (/^#.*opcode\.h/i .. /^#.*perl\.h/i) {
     print "opcode.h>> $_" if $debug > 2;
     if (/^OP \*\s/) { &scan_func($_); }
-    if (/^EXT/) { &scan_var($_); }
+    if (/^\s*EXT/) { &scan_var($_); }
     if (/^\s+OP_/) { &scan_enum($_); }
     last LINE unless $_ = <CPP>;
   }
@@ -216,12 +217,12 @@ LINE: while (<CPP>) {
   }
   while (/^#.*proto\.h/i .. /^#.*perl\.h/i) {
     print "proto.h>> $_" if $debug > 2;
-    if (/^EXT/) { &scan_var($_);  }
+    if (/\s*^EXT/) { &scan_var($_);  }
     else        { &scan_func($_); }
     last LINE unless $_ = <CPP>;
   }
   print $_ if $debug > 3 && ($debug > 5 || length($_));
-  if (/^EXT/) { &scan_var($_); }
+  if (/^\s*EXT/) { &scan_var($_); }
 }
 close CPP;
 
diff --git a/vms/perlvms.pod b/vms/perlvms.pod
index 5f9e91f635..c599e5834c 100644
--- a/vms/perlvms.pod
+++ b/vms/perlvms.pod
@@ -58,7 +58,7 @@ define a foreign command to invoke this image.
 Perl extensions are packages which provide both XS and Perl code
 to add new functionality to perl.  (XS is a meta-language which
 simplifies writing C code which interacts with Perl, see
-L<perlapi> for more details.)  The Perl code for an
+L<perlxs> for more details.)  The Perl code for an
 extension is treated like any other library module - it's
 made available in your script through the appropriate
 C<use> or C<require> statement, and usually defines a Perl