Integrate mainline

p4raw-id: //depot/perlio@14463

diff --git a/embed.fnc b/embed.fnc
index 1c6403f..3928a3c 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1014,7 +1014,7 @@ s |void   |apply_attrs    |HV *stash|SV *target|OP *attrs|bool for_my
 s      |void   |apply_attrs_my |HV *stash|OP *target|OP *attrs|OP **imopsp
 #  if defined(PL_OP_SLAB_ALLOC)
 s      |void*  |Slab_Alloc     |int m|size_t sz
-s      |void   |Slab_Free      |void *op
+s      |void   |Slab_Free      |void *op
 #  endif
 #endif
 

diff --git a/ext/threads/shared/t/0nothread.t b/ext/threads/shared/t/0nothread.t
index 9b08343..af83a41 100644 (file)
--- a/ext/threads/shared/t/0nothread.t
+++ b/ext/threads/shared/t/0nothread.t
@@ -1,5 +1,15 @@
-use Test::More tests => 53;
 use strict;
+use Config;
+BEGIN {
+    require Test::More;
+    if ($Config{'useithreads'}) {
+       Test::More->import( tests => 53 );
+    }
+    else {
+       Test::More->import(skip_all => "no useithreads");
+    }
+}
+
 
 my @array;
 my %hash;
@@ -58,6 +68,7 @@ ok((require threads::shared),"Require module");
 array(24,[],'Thing');
 hash(24,[],'Thing');
 
+
 import threads::shared;
 share(\@array);
 

diff --git a/perl.h b/perl.h
index 4d9a94e..3e640b3 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -435,7 +435,7 @@ int usleep(unsigned int);
 #  define MYSWAP
 #endif
 
-/* Cannot include embed.h here on Win32 as win32.h has not 
+/* Cannot include embed.h here on Win32 as win32.h has not
    yet been included and defines some config variables e.g. HAVE_INTERP_INTERN
  */
 #if !defined(PERL_FOR_X2P) && !(defined(WIN32)||defined(VMS))

diff --git a/t/op/utf8decode.t b/t/op/utf8decode.t
old mode 100644 (file)
new mode 100755 (executable)