From: Mark Dickinson <mdickinson@enthought.com>
Date: Sat, 7 Jul 2012 12:08:48 +0000 (+0200)
Subject: Use correct types for ASCII_CHAR_MASK integer constants.
X-Git-Tag: v3.3.0b2~304
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01ac8b6ab1474d863f364b6c11eb9fce62324169;p=thirdparty%2FPython%2Fcpython.git

Use correct types for ASCII_CHAR_MASK integer constants.
---

diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h
index 63bf648d7882..7d55f49a0033 100644
--- a/Objects/stringlib/codecs.h
+++ b/Objects/stringlib/codecs.h
@@ -8,9 +8,9 @@
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
-# define ASCII_CHAR_MASK 0x8080808080808080L
+# define ASCII_CHAR_MASK 0x8080808080808080UL
 #elif (SIZEOF_LONG == 4)
-# define ASCII_CHAR_MASK 0x80808080L
+# define ASCII_CHAR_MASK 0x80808080UL
 #else
 # error C 'long' size should be either 4 or 8!
 #endif
diff --git a/Objects/stringlib/find_max_char.h b/Objects/stringlib/find_max_char.h
index 098aeec46a57..9e344a0de95e 100644
--- a/Objects/stringlib/find_max_char.h
+++ b/Objects/stringlib/find_max_char.h
@@ -8,9 +8,9 @@
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
-# define UCS1_ASCII_CHAR_MASK 0x8080808080808080L
+# define UCS1_ASCII_CHAR_MASK 0x8080808080808080UL
 #elif (SIZEOF_LONG == 4)
-# define UCS1_ASCII_CHAR_MASK 0x80808080L
+# define UCS1_ASCII_CHAR_MASK 0x80808080UL
 #else
 # error C 'long' size should be either 4 or 8!
 #endif
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 353d2bbf2fa6..3e3abfc237ea 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4639,9 +4639,9 @@ PyUnicode_DecodeUTF8(const char *s,
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
-# define ASCII_CHAR_MASK 0x8080808080808080L
+# define ASCII_CHAR_MASK 0x8080808080808080UL
 #elif (SIZEOF_LONG == 4)
-# define ASCII_CHAR_MASK 0x80808080L
+# define ASCII_CHAR_MASK 0x80808080UL
 #else
 # error C 'long' size should be either 4 or 8!
 #endif