Integrate win32 branch into mainline

p4raw-id: //depot/perl@969

diff --cc INSTALL
Simple merge

diff --cc MANIFEST
Simple merge

diff --cc hints/netbsd.sh
Simple merge

diff --cc hints/svr4.sh
index 0a38702,eb875e1..2939e4e
--- 1/hints/svr4.sh
--- 2/hints/svr4.sh
+++ b/hints/svr4.sh
@@@ -68,12 -34,16 +68,17 @@@ f
  
  # UnixWare has a broken csh.  The undocumented -X argument to uname is probably
  # a reasonable way of detecting UnixWare.  Also in 2.1.1 the fields in
- # FILE* got renamed!
- #
+ # FILE* got renamed! Plus 1.1 can't cast large floats to 32-bit ints.
 -uw_ver=`uname -v`
 -uw_isuw=`uname -X 2>&1 | grep Release`
 +#     Leave leading tabs so Configure doesn't propagate these variables
- #     to config.sh
 +      uw_ver=`uname -v`
 +      uw_isuw=`uname -X 2>&1 | grep Release`
+ if [ "$uw_isuw" = "Release = 4.2" ]; then
+    case $uw_ver in
+    1.1)
+       d_casti32='undef'
+       ;;
+    esac
+ fi
  if [ "$uw_isuw" = "Release = 4.2MP" ]; then
     case $uw_ver in
     2.1)

diff --cc lib/ExtUtils/MM_OS2.pm
Simple merge

diff --cc lib/ExtUtils/MM_Unix.pm
Simple merge

diff --cc lib/strict.pm
Simple merge

diff --cc op.c
Simple merge

diff --cc os2/Makefile.SHs
Simple merge

diff --cc os2/os2.c
Simple merge

diff --cc perl.c
Simple merge

diff --cc perl.h
Simple merge

diff --cc pod/perlfunc.pod
Simple merge

diff --cc pod/perlsyn.pod
Simple merge

diff --cc pp.c
Simple merge

diff --cc pp_hot.c
Simple merge

diff --cc pp_sys.c
Simple merge

diff --cc proto.h
Simple merge

diff --cc sv.c
Simple merge

diff --cc vms/config.vms
Simple merge

diff --cc vms/descrip.mms
Simple merge

diff --cc win32/config.bc
Simple merge

diff --cc win32/config.vc
Simple merge