From: Malcolm Beattie <mbeattie@sable.ox.ac.uk>
Date: Tue, 18 Nov 1997 11:56:09 +0000 (+0000)
Subject: Integrate win32 branch back into mainline.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3c4f770c93854ee7c6f0c96a5913404f60061eb2;p=p5sagit%2Fp5-mst-13.2.git

Integrate win32 branch back into mainline.

p4raw-id: //depot/perl@262
---

3c4f770c93854ee7c6f0c96a5913404f60061eb2
diff --cc op.c
index bc672f7,bc672f7..21dc249
--- a/op.c
+++ b/op.c
@@@ -4679,7 -4679,7 +4679,7 @@@ peep(register OP *o
  	case OP_LC:
  	case OP_LCFIRST:
  	case OP_QUOTEMETA:
--	    if (o->op_next->op_type == OP_STRINGIFY)
++	    if (o->op_next && o->op_next->op_type == OP_STRINGIFY)
  		null(o->op_next);
  	    o->op_seq = op_seqmax++;
  	    break;
diff --cc perl.h
index 2d49fc3,a2f5630..5ee7591
--- a/perl.h
+++ b/perl.h
@@@ -39,13 -42,13 +42,7 @@@
  #  define EXTERN_C
  #endif
  
--#if defined(USE_THREADS) /* && !defined(PERL_CORE) && !defined(PERLDLL) */
--#ifndef CRIPPLED_CC
--#define CRIPPLED_CC
--#endif
--#endif
--
--#ifdef OP_IN_REGISTER
++ifdef OP_IN_REGISTER
  #  ifdef __GNUC__
  #    define stringify_immed(s) #s
  #    define stringify(s) stringify_immed(s)