Initial (untested) integration of mainline changes.

p4raw-id: //depot/win32/perl@234

diff --cc embed.h
Simple merge

diff --cc interp.sym
Simple merge

diff --cc perl.c
Simple merge

diff --cc perl.h
Simple merge

diff --cc pp_ctl.c
Simple merge

diff --cc run.c
index 87633d1,543fb08..6afab88
--- 1/run.c
--- 2/run.c
+++ b/run.c
@@@ -20,8 -20,10 +20,8 @@@ dEXT char **watchaddr = 0
  dEXT char *watchok;
  
  int
- runops_standard() {
+ runops_standard(void) {
      dTHR;
 -    SAVEI32(runlevel);
 -    runlevel++;
  
      while ( op = (*op->op_ppaddr)(ARGS) ) ;
  

diff --cc thread.h
Simple merge

diff --cc toke.c
Simple merge

diff --cc util.c
Simple merge

diff --cc win32/Makefile
Simple merge

diff --cc win32/makefile.mk
index 3dc00a2,655efb7..e7c3857
--- 1/win32/makefile.mk
--- 2/win32/makefile.mk
+++ b/win32/makefile.mk
@@@ -10,8 -10,8 +10,8 @@@
  # Set these to wherever you want "nmake install" to put your
  # newly built perl.
  INST_DRV=c:
--INST_TOP=$(INST_DRV)\perl\perl5004.5X
--BUILDOPT=-DUSE_THREADS 
++INST_TOP=$(INST_DRV)\perl
++BUILDOPT=-DUSE_THREADS
  
  # -DUSE_PERLIO -D__STDC__=1 -DUSE_SFIO -DI_SFIO -I\sfio97\include