Integrate win32 branch into mainline.

p4raw-id: //depot/perl@983

diff --cc lib/strict.pm
index 2b1d964,940e8bf..4e2baa3
--- 1/lib/strict.pm
--- 2/lib/strict.pm
+++ b/lib/strict.pm
@@@ -77,14 -77,14 +77,6 @@@ See L<perlmodlib/Pragmatic Modules>
  
  =cut
  
--$strict::VERSION = "1.01";
--
--my %bitmask = (
--refs => 0x00000002,
--subs => 0x00000200,
--vars => 0x00000400
--);
--
  sub bits {
      my $bits = 0;
      foreach my $s (@_){ $bits |= $bitmask{$s} || 0; };

diff --cc perl.c
Simple merge

diff --cc perl.h
index 42250ed,fc96064..3f97dc2
--- 1/perl.h
--- 2/perl.h
+++ b/perl.h
@@@ -710,6 -710,6 +710,15 @@@ Free_t   Perl_free _((Malloc_t where))
  #  endif
  #endif
  
++/* XXX Experimental set-up for long long.  Just add -DUSE_LONG_LONG
++   to your ccflags.  --Andy Dougherty   4/1998
++*/
++#ifdef USE_LONG_LONG
++#  if defined(HAS_LONG_LONG) && LONGLONGSIZE == 8
++#    define Quad_t long long
++#  endif
++#endif
++
  #ifdef Quad_t
  #   define HAS_QUAD
      typedef Quad_t IV;

diff --cc pod/perldebug.pod
index 8937c7e,8f49541..68f3684
--- 1/pod/perldebug.pod
--- 2/pod/perldebug.pod
+++ b/pod/perldebug.pod
@@@ -298,6 -298,6 +298,14 @@@ Add a global watch-expression
  
  Delete all watch-expressions.
  
++=item W [expr]
++
++Add a global watch-expression.
++
++=item W
++
++Delete all watch-expressions.
++
  =item O [opt[=val]] [opt"val"] [opt?]...
  
  Set or query values of options.  val defaults to 1.  opt can