diff options
| author | Trent Nelson <trent@trent.me> | 2012-10-17 22:08:40 (GMT) |
|---|---|---|
| committer | Trent Nelson <trent@trent.me> | 2012-10-17 22:08:40 (GMT) |
| commit | f17512f67e545bfeda1905b63f80217e0b7853aa (patch) | |
| tree | f88dd59d7d4b46c8063ec714dae0c99dbf3aeca6 /Objects/stringlib | |
| parent | c78649873fe76da34230bb8ee5284ff64b2af2e4 (diff) | |
| parent | 743e0cd6b5d59767aae2524700857f188ca1e80e (diff) | |
| download | cpython-f17512f67e545bfeda1905b63f80217e0b7853aa.zip cpython-f17512f67e545bfeda1905b63f80217e0b7853aa.tar.gz cpython-f17512f67e545bfeda1905b63f80217e0b7853aa.tar.bz2 | |
Merge heads.
Diffstat (limited to 'Objects/stringlib')
| -rw-r--r-- | Objects/stringlib/codecs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h index 2a01089..cbf3508 100644 --- a/Objects/stringlib/codecs.h +++ b/Objects/stringlib/codecs.h @@ -47,7 +47,7 @@ STRINGLIB(utf8_decode)(const char **inptr, const char *end, unsigned long value = *(unsigned long *) _s; if (value & ASCII_CHAR_MASK) break; -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN _p[0] = (STRINGLIB_CHAR)(value & 0xFFu); _p[1] = (STRINGLIB_CHAR)((value >> 8) & 0xFFu); _p[2] = (STRINGLIB_CHAR)((value >> 16) & 0xFFu); @@ -454,7 +454,7 @@ STRINGLIB(utf16_decode)(const unsigned char **inptr, const unsigned char *e, const unsigned char *q = *inptr; STRINGLIB_CHAR *p = dest + *outpos; /* Offsets from q for retrieving byte pairs in the right order. */ -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN int ihi = !!native_ordering, ilo = !native_ordering; #else int ihi = !native_ordering, ilo = !!native_ordering; @@ -485,7 +485,7 @@ STRINGLIB(utf16_decode)(const unsigned char **inptr, const unsigned char *e, block = SWAB(block); #endif } -#ifdef BYTEORDER_IS_LITTLE_ENDIAN +#if PY_LITTLE_ENDIAN # if SIZEOF_LONG == 4 p[0] = (STRINGLIB_CHAR)(block & 0xFFFFu); p[1] = (STRINGLIB_CHAR)(block >> 16); |