diff options
| author | Karl Williamson <khw@cpan.org> | 2014-06-12 14:31:24 -0600 |
|---|---|---|
| committer | Karl Williamson <khw@cpan.org> | 2014-06-12 15:04:54 -0600 |
| commit | 5a6bb681360972ef854d7b6b457148c9b1aa61a8 (patch) | |
| tree | 72adab033725448162fd66705fda8c1b0bfed475 /pp.c | |
| parent | 130c5df3625bd130cd1e2771308fcd4eb66cebb2 (diff) | |
| download | perl-5a6bb681360972ef854d7b6b457148c9b1aa61a8.tar.gz | |
pp.c: Fix Win32 compilation problems
Commit 130c5df3625bd130cd1e2771308fcd4eb66cebb2 introduced errors into
Windows (at least) compilations because it used #if's in the middle of
apparent function calls, but these were really macros that turned the
function call foo() into a call of Perl_foo(), and so we were doing
an #if from within a #define which is not generally legal.
Diffstat (limited to 'pp.c')
| -rw-r--r-- | pp.c | 24 |
1 files changed, 8 insertions, 16 deletions
@@ -3514,22 +3514,18 @@ PP(pp_ucfirst) doing_utf8 = TRUE; ulen = UTF8SKIP(s); if (op_type == OP_UCFIRST) { - _to_utf8_title_flags(s, tmpbuf, &tculen, #ifdef USE_LOCALE_CTYPE - IN_LC_RUNTIME(LC_CTYPE) + _to_utf8_title_flags(s, tmpbuf, &tculen, IN_LC_RUNTIME(LC_CTYPE)); #else - 0 + _to_utf8_title_flags(s, tmpbuf, &tculen, 0); #endif - ); } else { - _to_utf8_lower_flags(s, tmpbuf, &tculen, #ifdef USE_LOCALE_CTYPE - IN_LC_RUNTIME(LC_CTYPE) + _to_utf8_lower_flags(s, tmpbuf, &tculen, IN_LC_RUNTIME(LC_CTYPE)); #else - 0 + _to_utf8_lower_flags(s, tmpbuf, &tculen, 0); #endif - ); } /* we can't do in-place if the length changes. */ @@ -3816,13 +3812,11 @@ PP(pp_uc) * and copy it to the output buffer */ u = UTF8SKIP(s); - uv = _to_utf8_upper_flags(s, tmpbuf, &ulen, #ifdef USE_LOCALE_CTYPE - IN_LC_RUNTIME(LC_CTYPE) + uv = _to_utf8_upper_flags(s, tmpbuf, &ulen, IN_LC_RUNTIME(LC_CTYPE)); #else - 0 + uv = _to_utf8_upper_flags(s, tmpbuf, &ulen, 0); #endif - ); #define GREEK_CAPITAL_LETTER_IOTA 0x0399 #define COMBINING_GREEK_YPOGEGRAMMENI 0x0345 if (uv == GREEK_CAPITAL_LETTER_IOTA @@ -4033,13 +4027,11 @@ PP(pp_lc) const STRLEN u = UTF8SKIP(s); STRLEN ulen; - _to_utf8_lower_flags(s, tmpbuf, &ulen, #ifdef USE_LOCALE_CTYPE - IN_LC_RUNTIME(LC_CTYPE) + _to_utf8_lower_flags(s, tmpbuf, &ulen, IN_LC_RUNTIME(LC_CTYPE)); #else - 0 + _to_utf8_lower_flags(s, tmpbuf, &ulen, 0); #endif - ); /* Here is where we would do context-sensitive actions. See the * commit message for 86510fb15 for why there isn't any */ |