Root is the lizard king.

[p5sagit/p5-mst-13.2.git] / utf8.c

diff --git a/utf8.c b/utf8.c
index 8711137..3a5c1ec 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -50,7 +50,7 @@ Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv)
        *d++ = UTF_TO_NATIVE(uv);
        return d;
     }
-#if defined(EBCDIC) || 1 /* always for testing */
+#if defined(EBCDIC)
     else {
        STRLEN len  = UNISKIP(uv);
        U8 *p = d+len-1;
@@ -1228,8 +1228,6 @@ Perl_to_utf8_case(pTHX_ U8 *p, U8* ustrp, STRLEN *lenp, SV **swashp,char *normal
         HE *he;
 
         uv = utf8_to_uvchr(p, 0);
-        if (uv <= 0xff)
-            uv = NATIVE_TO_UTF(uv);
 
         if ((hv    = get_hv(special, FALSE)) &&
             (keysv = sv_2mortal(Perl_newSVpvf(aTHX_ "%04"UVXf, uv))) &&
@@ -1240,7 +1238,6 @@ Perl_to_utf8_case(pTHX_ U8 *p, U8* ustrp, STRLEN *lenp, SV **swashp,char *normal
              if (*lenp > 1 || UNI_IS_INVARIANT(c))
                   Copy(s, ustrp, *lenp, U8);
              else {
-                  c = UTF_TO_NATIVE(c);
                   /* something in the 0x80..0xFF range */
                   ustrp[0] = UTF8_EIGHT_BIT_HI(c);
                   ustrp[1] = UTF8_EIGHT_BIT_LO(c);
@@ -1590,7 +1587,7 @@ Perl_ibcmp_utf8(pTHX_ const char *s1, bool u1, const char *s2, bool u2, register
                    ulen2 = 1;
               if (ulen1 != ulen2
                   || (ulen1 == 1 && PL_fold[ca] != PL_fold[cb])
-                  || memNE(tmpbuf1, tmpbuf2, ulen1))
+                  || memNE((char *)tmpbuf1, (char *)tmpbuf2, ulen1))
                    return 1;
          }
          a += la;