windows build tweaks (op/sprintf.t still fails tests 120-121, 149)

p4raw-id: //depot/perl@6375

4 files changed, 21 insertions, 11 deletions

diff --git a/t/op/sprintf.t b/t/op/sprintf.t
index 50b4c77dfe..0c2400c1a7 100755
--- a/t/op/sprintf.t
+++ b/t/op/sprintf.t
@@ -21,9 +21,9 @@ print '1..', scalar @tests, "\n";
 
 $SIG{__WARN__} = sub {
     if ($_[0] =~ /^Invalid conversion/) {
-    $w = ' INVALID'
+	$w = ' INVALID'
     } else {
-    warn @_;
+	warn @_;
     }
 };
 
@@ -34,17 +34,26 @@ for ($i = 1; @tests; $i++) {
     $x = sprintf(">$template<",
                  defined @$evalData ? @$evalData : $evalData);
     substr($x, -1, 0) = $w if $w;
-	($y = $x) =~ s/([Ee][-+])0(\d)/$1$2/g;	# $y has 3 exponent digits, not 2
+    # $y may have 3 exponent digits, not 2
+    my $r;
+    if (($y = $x) =~ s/([Ee][-+])0(\d)/$1$2/g) {
+	$y =~ s/^>\s+/>/;
+	$y =~ s/\s+<$/</;
+	$r = $result;
+	$r =~ s/^\s+//;
+	$r =~ s/\s+$//;
+    }
+
     if ($x eq ">$result<") {
         print "ok $i\n";
     }
-	elsif ($y eq ">$result<")				# Some C libraries always give
-	{										# three-digit exponent
-		print("ok $i >$result< $x # three-digit exponent accepted\n");
-	}
+    elsif ($r and $y eq ">$r<")	# Some C libraries always give
+    {				# three-digit exponent
+	print("ok $i >$result< $x # three-digit exponent accepted\n");
+    }
     else {
-    print("not ok $i >$template< >$data< >$result< $x",
-        $comment ? " # $comment\n" : "\n");
+	print("not ok $i >$template< >$data< >$result< $x",
+	    $comment ? " # $comment\n" : "\n");
     }
 }
     
diff --git a/win32/Makefile b/win32/Makefile
index f5ee4c6482..1bcda2878c 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -973,7 +973,7 @@ utils: $(PERLEXE) $(X2P)
 	copy ..\README.win32 .\perlwin32.pod
 	$(MAKE) -f ..\win32\pod.mak converters
 	cd ..\lib
-	$(PERLEXE) lib.pm.PL
+	$(PERLEXE) lib_pm.PL
 	cd ..\win32
 	$(PERLEXE) $(PL2BAT) $(UTILS)
 
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 21836b22ec..6722a5efcf 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1191,6 +1191,7 @@ utils: $(PERLEXE) $(X2P)
 	copy ..\README.os2 ..\pod\perlos2.pod
 	copy ..\vms\perlvms.pod ..\pod\perlvms.pod
 	cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
+	cd ..\lib && $(PERLEXE) lib_pm.PL
 	$(PERLEXE) $(PL2BAT) $(UTILS)
 
 distclean: clean
diff --git a/win32/win32sck.c b/win32/win32sck.c
index 043ad442fd..f7d101bc8b 100644
--- a/win32/win32sck.c
+++ b/win32/win32sck.c
@@ -105,7 +105,7 @@ set_socktype(void)
 {
 #ifdef USE_SOCKETS_AS_HANDLES
 #if defined(USE_THREADS) || defined(USE_ITHREADS)
-    dTHX;
+    dTHXo;
     if (!w32_init_socktype) {
 #endif
 	int iSockOpt = SO_SYNCHRONOUS_NONALERT;