Integrate mainline.

p4raw-id: //depot/perlio@9420

diff --git a/ext/IO/IO.xs b/ext/IO/IO.xs
index 4987b3d..3abc94b 100644 (file)
--- a/ext/IO/IO.xs
+++ b/ext/IO/IO.xs
@@ -420,7 +420,7 @@ sockatmark (sock)
    InputStream sock
    PROTOTYPE: $
    PREINIT:
-     int fd,flag,result;
+     int fd,flag=0;
    CODE:
    {
      fd = PerlIO_fileno(sock);

diff --git a/lib/ExtUtils/MM_VMS.pm b/lib/ExtUtils/MM_VMS.pm
index ef5b541..072bc28 100644 (file)
--- a/lib/ExtUtils/MM_VMS.pm
+++ b/lib/ExtUtils/MM_VMS.pm
@@ -1389,7 +1389,7 @@ END
     push @m,
 qq[POD2MAN_EXE = $pod2man_exe\n],
 q[POD2MAN = $(PERL) -we "%m=@ARGV;for (keys %m){" -
--e "system(""MCR $^X $(POD2MAN_EXE) $_ >$m{$_}"");}"
+-e "system(""MCR $^X "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" $(POD2MAN_EXE) $_ >$m{$_}"");}"
 ];
     push @m, "\nmanifypods : \$(MAN1PODS) \$(MAN3PODS)\n";
     if (%{$self->{MAN1PODS}} || %{$self->{MAN3PODS}}) {

diff --git a/makedef.pl b/makedef.pl
index 18712a3..948066b 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -931,6 +931,7 @@ PerlIOBase_clearerr
 PerlIOBase_setlinebuf
 PerlIOBase_pushed
 PerlIOBase_read
+PerlIOBase_unread
 PerlIOBase_error
 PerlIOBase_eof
 PerlIOBuf_tell

diff --git a/vms/vms.c b/vms/vms.c
index f63bbde..7e90656 100644 (file)
--- a/vms/vms.c
+++ b/vms/vms.c
@@ -4771,10 +4771,10 @@ static unsigned int *sockflags, sockflagsize;
  * We don't shim the other file open routines since a socket isn't
  * likely to be opened by a name.
  */
-/*{{{ FILE *my_fdopen(int fd, char *mode)*/
-FILE *my_fdopen(int fd, char *mode)
+/*{{{ FILE *my_fdopen(int fd, const char *mode)*/
+FILE *my_fdopen(int fd, const char *mode)
 {
-  FILE *fp = fdopen(fd,mode);
+  FILE *fp = fdopen(fd, (char *) mode);
 
   if (fp) {
     unsigned int fdoff = fd / sizeof(unsigned int);

diff --git a/vms/vmsish.h b/vms/vmsish.h
index 15cda49..a8551da 100644 (file)
--- a/vms/vmsish.h
+++ b/vms/vmsish.h
@@ -736,7 +736,7 @@ bool        vms_do_aexec (SV *, SV **, SV **);
 bool   vms_do_exec (char *);
 unsigned long int      do_aspawn (void *, void **, void **);
 unsigned long int      do_spawn (char *);
-FILE *  my_fdopen (int, char *);
+FILE *  my_fdopen (int, const char *);
 int     my_fclose (FILE *);
 int    my_fwrite (void *, size_t, size_t, FILE *);
 int    my_flush (FILE *);