This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Initial (untested) integration of mainline changes.
authorGurusamy Sarathy <gsar@cpan.org>
Tue, 11 Nov 1997 23:08:54 +0000 (23:08 +0000)
committerGurusamy Sarathy <gsar@cpan.org>
Tue, 11 Nov 1997 23:08:54 +0000 (23:08 +0000)
p4raw-id: //depot/win32/perl@234

1  2 
embed.h
interp.sym
perl.c
perl.h
pp_ctl.c
run.c
thread.h
toke.c
util.c
win32/Makefile
win32/makefile.mk

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
--- 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
@@@ -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