Change 33719: Integrate:

Change 33719 by davem@davem-pigeon on 2008/04/21 23:41:15

	Integrate:
	[ 32780]
	Upgrade to IPC::SysV 2.00

Affected files ...

... //depot/maint-5.10/perl/ext/IPC/SysV/Changes#2 integrate
... //depot/maint-5.10/perl/ext/IPC/SysV/Makefile.PL#3 integrate
... //depot/maint-5.10/perl/ext/IPC/SysV/SysV.xs#3 integrate
... //depot/maint-5.10/perl/ext/IPC/SysV/lib/IPC/Msg.pm#2 integrate
... //depot/maint-5.10/perl/ext/IPC/SysV/lib/IPC/Semaphore.pm#2 integrate
... //depot/maint-5.10/perl/ext/IPC/SysV/lib/IPC/SharedMem.pm#2 integrate
... //depot/maint-5.10/perl/ext/IPC/SysV/lib/IPC/SysV.pm#2 integrate

Differences ...

==== //depot/maint-5.10/perl/ext/IPC/SysV/Changes#2 (text) ====
Index: perl/ext/IPC/SysV/Changes
--- perl/ext/IPC/SysV/Changes#1~33718~	2008-04-21 16:20:43.000000000 -0700
+++ perl/ext/IPC/SysV/Changes	2008-04-21 16:41:15.000000000 -0700
@@ -1,3 +1,8 @@
+2.00 - 2007-12-30
+
+    * fixed compilation issues with C++ compiler
+    * ignore .swp files in when scanning lib directory
+
 1.99_07 - 2007-10-22
 
     * terminate Makefile.PL on MSWin32 with a message that the

==== //depot/maint-5.10/perl/ext/IPC/SysV/Makefile.PL#3 (text) ====
Index: perl/ext/IPC/SysV/Makefile.PL
--- perl/ext/IPC/SysV/Makefile.PL#2~33718~	2008-04-21 16:20:43.000000000 -0700
+++ perl/ext/IPC/SysV/Makefile.PL	2008-04-21 16:41:15.000000000 -0700
@@ -1,8 +1,8 @@
 ################################################################################
 #
-#  $Revision: 14 $
+#  $Revision: 15 $
 #  $Author: mhx $
-#  $Date: 2007/10/22 13:14:21 +0200 $
+#  $Date: 2007/12/22 17:39:55 +0100 $
 #
 ################################################################################
 #
@@ -76,7 +76,7 @@
 sub MY::libscan
 {
  my($self, $path) = @_;
- return '' if $path =~ m! /(RCS|CVS|SCCS)/ | [~%]$ | \.(orig|rej)$ !x;
+ return '' if $path =~ m! /(RCS|CVS|SCCS)/ | [~%]$ | \.(swp|orig|rej)$ !x;
  $path;
 }
 

==== //depot/maint-5.10/perl/ext/IPC/SysV/SysV.xs#3 (text) ====
Index: perl/ext/IPC/SysV/SysV.xs
--- perl/ext/IPC/SysV/SysV.xs#2~33718~	2008-04-21 16:20:43.000000000 -0700
+++ perl/ext/IPC/SysV/SysV.xs	2008-04-21 16:41:15.000000000 -0700
@@ -1,8 +1,8 @@
 /*******************************************************************************
 *
-*  $Revision: 30 $
+*  $Revision: 31 $
 *  $Author: mhx $
-*  $Date: 2007/10/18 19:57:29 +0200 $
+*  $Date: 2007/12/29 19:46:18 +0100 $
 *
 ********************************************************************************
 *
@@ -347,7 +347,7 @@
     int pos
     int size
   CODE:
-    char *caddr = sv2addr(addr);
+    char *caddr = (char *) sv2addr(addr);
     char *dst;
     if (!SvOK(sv))
     {
@@ -372,7 +372,7 @@
     int pos
     int size
   CODE:
-    char *caddr = sv2addr(addr);
+    char *caddr = (char *) sv2addr(addr);
     STRLEN len;
     const char *src = SvPV_const(sv, len);
     int n = ((int) len > size) ? size : (int) len;

==== //depot/maint-5.10/perl/ext/IPC/SysV/lib/IPC/Msg.pm#2 (text) ====
Index: perl/ext/IPC/SysV/lib/IPC/Msg.pm
--- perl/ext/IPC/SysV/lib/IPC/Msg.pm#1~33718~	2008-04-21 16:20:43.000000000 -0700
+++ perl/ext/IPC/SysV/lib/IPC/Msg.pm	2008-04-21 16:41:15.000000000 -0700
@@ -21,7 +21,7 @@
 use vars qw($VERSION);
 use Carp;
 
-$VERSION = do { my @r = '$Snapshot: /IPC-SysV/1.99_07 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
+$VERSION = do { my @r = '$Snapshot: /IPC-SysV/2.00 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
 $VERSION = eval $VERSION;
 
 # Figure out if we have support for native sized types

==== //depot/maint-5.10/perl/ext/IPC/SysV/lib/IPC/Semaphore.pm#2 (text) ====
Index: perl/ext/IPC/SysV/lib/IPC/Semaphore.pm
--- perl/ext/IPC/SysV/lib/IPC/Semaphore.pm#1~33718~	2008-04-21 16:20:43.000000000 -0700
+++ perl/ext/IPC/SysV/lib/IPC/Semaphore.pm	2008-04-21 16:41:15.000000000 -0700
@@ -22,7 +22,7 @@
 use vars qw($VERSION);
 use Carp;
 
-$VERSION = do { my @r = '$Snapshot: /IPC-SysV/1.99_07 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
+$VERSION = do { my @r = '$Snapshot: /IPC-SysV/2.00 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
 $VERSION = eval $VERSION;
 
 # Figure out if we have support for native sized types

==== //depot/maint-5.10/perl/ext/IPC/SysV/lib/IPC/SharedMem.pm#2 (text) ====
Index: perl/ext/IPC/SysV/lib/IPC/SharedMem.pm
--- perl/ext/IPC/SysV/lib/IPC/SharedMem.pm#1~33718~	2008-04-21 16:20:43.000000000 -0700
+++ perl/ext/IPC/SysV/lib/IPC/SharedMem.pm	2008-04-21 16:41:15.000000000 -0700
@@ -21,7 +21,7 @@
 use vars qw($VERSION);
 use Carp;
 
-$VERSION = do { my @r = '$Snapshot: /IPC-SysV/1.99_07 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
+$VERSION = do { my @r = '$Snapshot: /IPC-SysV/2.00 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
 $VERSION = eval $VERSION;
 
 # Figure out if we have support for native sized types

==== //depot/maint-5.10/perl/ext/IPC/SysV/lib/IPC/SysV.pm#2 (text) ====
Index: perl/ext/IPC/SysV/lib/IPC/SysV.pm
--- perl/ext/IPC/SysV/lib/IPC/SysV.pm#1~33718~	2008-04-21 16:20:43.000000000 -0700
+++ perl/ext/IPC/SysV/lib/IPC/SysV.pm	2008-04-21 16:41:15.000000000 -0700
@@ -24,7 +24,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = do { my @r = '$Snapshot: /IPC-SysV/1.99_07 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
+$VERSION = do { my @r = '$Snapshot: /IPC-SysV/2.00 $' =~ /(\d+\.\d+(?:_\d+)?)/; @r ? $r[0] : '9.99' };
 $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
End of Patch.

• Change 33719: Integrate: by Dave Mitchell