This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Integrate win32 branch into mainline
authorMalcolm Beattie <mbeattie@sable.ox.ac.uk>
Thu, 14 May 1998 16:15:09 +0000 (16:15 +0000)
committerMalcolm Beattie <mbeattie@sable.ox.ac.uk>
Thu, 14 May 1998 16:15:09 +0000 (16:15 +0000)
p4raw-id: //depot/perl@969

23 files changed:
1  2 
INSTALL
MANIFEST
hints/netbsd.sh
hints/svr4.sh
lib/ExtUtils/MM_OS2.pm
lib/ExtUtils/MM_Unix.pm
lib/strict.pm
op.c
os2/Makefile.SHs
os2/os2.c
perl.c
perl.h
pod/perlfunc.pod
pod/perlsyn.pod
pp.c
pp_hot.c
pp_sys.c
proto.h
sv.c
vms/config.vms
vms/descrip.mms
win32/config.bc
win32/config.vc

diff --cc INSTALL
Simple merge
diff --cc MANIFEST
Simple merge
diff --cc hints/netbsd.sh
Simple merge
diff --cc 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)
Simple merge
Simple merge
diff --cc lib/strict.pm
Simple merge
diff --cc op.c
Simple merge
Simple merge
diff --cc os2/os2.c
Simple merge
diff --cc perl.c
Simple merge
diff --cc perl.h
Simple merge
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