Change 14990 by jhi@alpha on 2002/03/04 13:34:15
Attempt at portability.
Affected files ...
.... //depot/perl/util.c#325 edit
Differences ...
==== //depot/perl/util.c#325 (text) ====
Index: perl/util.c
--- perl/util.c.~1~ Mon Mar 4 06:45:05 2002
+++ perl/util.c Mon Mar 4 06:45:05 2002
@@ -4366,16 +4366,20 @@
while (sbyte < ebyte) {
if (sutf >= eutf)
return 1; /* utf one shorter */
- if (*sbyte < 128) {
+ if (NATIVE_IS_INVARIANT(*sbyte)) {
if (*sbyte != *sutf)
return *sbyte - *sutf;
sbyte++; sutf++; /* CONTINUE */
- } else if ((*sutf & 0x3F) == (*sbyte >> 6)) { /* byte 0xFF: 0xC3 BF */
- if ((sutf[1] & 0x3F) != (*sbyte & 0x3F))
- return (*sbyte & 0x3F) - (*sutf & 0x3F);
+ } else if ((*sutf & UTF_CONTINUATION_MASK) ==
+ (*sbyte >> UTF_ACCUMULATION_SHIFT)) {
+ if ((sutf[1] & UTF_CONTINUATION_MASK) !=
+ (*sbyte & UTF_CONTINUATION_MASK))
+ return (*sbyte & UTF_CONTINUATION_MASK) -
+ (*sutf & UTF_CONTINUATION_MASK);
sbyte++, sutf += 2; /* CONTINUE */
} else
- return (*sbyte >> 6) - (*sutf & 0x3F);
+ return (*sbyte >> UTF_ACCUMULATION_SHIFT) -
+ (*sutf & UTF_CONTINUATION_MASK);
}
if (sutf >= eutf)
return 0;
End of Patch.
