integrate cfgperl contents into mainline

p4raw-id: //depot/perl@5822

2 files changed, 15 insertions, 16 deletions

diff --git a/ext/IPC/SysV/Msg.pm b/ext/IPC/SysV/Msg.pm
index 099329826f..120a5b2d3a 100644
--- a/ext/IPC/SysV/Msg.pm
+++ b/ext/IPC/SysV/Msg.pm
@@ -90,14 +90,14 @@ sub rcv {
     msgrcv($$self,$buf,$_[1],$_[2] || 0, $_[3] || 0) or
 	return;
     my $type;
-    ($type,$_[0]) = unpack("L a*",$buf);
+    ($type,$_[0]) = unpack("l! a*",$buf);
     $type;
 }
 
 sub snd {
     @_ <= 4 && @_ >= 3 or  croak '$msg->snd( TYPE, BUF, FLAGS )';
     my $self = shift;
-    msgsnd($$self,pack("L a*",$_[0],$_[1]), $_[2] || 0);
+    msgsnd($$self,pack("l! a*",$_[0],$_[1]), $_[2] || 0);
 }
 
 
@@ -111,12 +111,12 @@ IPC::Msg - SysV Msg IPC object class
 
 =head1 SYNOPSIS
 
-    use IPC::SysV qw(IPC_PRIVATE S_IRWXU S_IRWXG S_IRWXO);
+    use IPC::SysV qw(IPC_PRIVATE S_IRWXU);
     use IPC::Msg;
 
-    $msg = new IPC::Msg(IPC_PRIVATE, S_IRWXU | S_IRWXG | S_IRWXO);
+    $msg = new IPC::Msg(IPC_PRIVATE, S_IRWXU);
 
-    $msg->snd(pack("L a*",$msgtype,$msg));
+    $msg->snd(pack("l! a*",$msgtype,$msg));
 
     $msg->rcv($buf,256);
 
@@ -157,8 +157,8 @@ Returns the system message queue identifier.
 
 =item rcv ( BUF, LEN [, TYPE [, FLAGS ]] )
 
-Read a message from the queue. Returns the type of the message read. See
-L<msgrcv>
+Read a message from the queue. Returns the type of the message read.
+See L<msgrcv>.  The  BUF becomes tainted.
 
 =item remove
 
diff --git a/ext/Thread/Thread.pm b/ext/Thread/Thread.pm
index 3e50a99cd4..00cba8af67 100644
--- a/ext/Thread/Thread.pm
+++ b/ext/Thread/Thread.pm
@@ -36,16 +36,15 @@ Thread - manipulate threads in Perl (EXPERIMENTAL, subject to change)
 
 =head1 DESCRIPTION
 
-The C<Thread> module provides multithreading support for perl.
-
-WARNING: Threading is an experimental feature.  Both the interface
-and implementation are subject to change drastically.
+    WARNING: Threading is an experimental feature.  Both the interface
+    and implementation are subject to change drastically.  In fact, this
+    documentation describes the flavor of threads that was in version
+    5.005.  Perl 5.6.0 and later have the beginnings of support for
+    interpreter threads, which (when finished) is expected to be
+    significantly different from what is described here.  The information
+    contained here may therefore soon be obsolete.  Use at your own risk!
 
-In fact, this documentation describes the flavor of threads that was in
-version 5.005.  Perl v5.6 has the beginnings of support for interpreter
-threads, which (when finished) is expected to be significantly different
-from what is described here.  The information contained here may therefore
-soon be obsolete.  Use at your own risk!
+The C<Thread> module provides multithreading support for perl.
 
 =head1 FUNCTIONS