Integrate win32 branch back into mainline.
authorMalcolm Beattie <mbeattie@sable.ox.ac.uk>
Tue, 18 Nov 1997 11:56:09 +0000 (11:56 +0000)
committerMalcolm Beattie <mbeattie@sable.ox.ac.uk>
Tue, 18 Nov 1997 11:56:09 +0000 (11:56 +0000)
p4raw-id: //depot/perl@262

1  2 
op.c
perl.h

diff --cc op.c
--- 1/op.c
--- 2/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
--- 1/perl.h
--- 2/perl.h
+++ b/perl.h
  #  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)