diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-07-27 18:10:14 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-07-27 18:10:14 +0000 |
| commit | 6a27c1886bf0bf3e39d48bdfab21e85f07acacb3 (patch) | |
| tree | 9850608e2eb22634c1420b7cd8055bb91eb13b52 /toke.c | |
| parent | c485e6072d15e92c314a8b9cb6957c3edf13f985 (diff) | |
| download | perl-6a27c1886bf0bf3e39d48bdfab21e85f07acacb3.tar.gz | |
integrate 5.005_01 changes from maint
p4raw-id: //depot/perl@1670
p4raw-integrated: from //depot/maint-5.005/perl@1667 'copy in'
README.win32 win32/GenCAPI.pl win32/win32.c (@1649..)
pod/perldelta.pod (@1654..) 'merge in' toke.c (@1649..) proto.h
(@1662..)
Diffstat (limited to 'toke.c')
| -rw-r--r-- | toke.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -11,8 +11,6 @@ * "It all comes from here, the stench and the peril." --Frodo */ -#define TMP_CRLF_PATCH - #include "EXTERN.h" #include "perl.h" @@ -2078,7 +2076,7 @@ yylex(void) } goto retry; case '\r': -#ifndef TMP_CRLF_PATCH +#ifdef PERL_STRICT_CR warn("Illegal character \\%03o (carriage return)", '\r'); croak( "(Maybe you didn't strip carriage returns after a network transfer?)\n"); @@ -5318,7 +5316,7 @@ scan_heredoc(register char *s) *d++ = '\n'; *d = '\0'; len = d - PL_tokenbuf; -#ifdef TMP_CRLF_PATCH +#ifndef PERL_STRICT_CR d = strchr(s, '\r'); if (d) { char *olds = s; @@ -5394,7 +5392,7 @@ scan_heredoc(register char *s) } PL_curcop->cop_line++; PL_bufend = SvPVX(PL_linestr) + SvCUR(PL_linestr); -#ifdef TMP_CRLF_PATCH +#ifndef PERL_STRICT_CR if (PL_bufend - PL_linestart >= 2) { if ((PL_bufend[-2] == '\r' && PL_bufend[-1] == '\n') || (PL_bufend[-2] == '\n' && PL_bufend[-1] == '\r')) @@ -5693,7 +5691,7 @@ scan_str(char *start) if (s < PL_bufend) break; /* handle case where we are done yet :-) */ -#ifdef TMP_CRLF_PATCH +#ifndef PERL_STRICT_CR if (to - SvPVX(sv) >= 2) { if ((to[-2] == '\r' && to[-1] == '\n') || (to[-2] == '\n' && to[-1] == '\r')) |