From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 20 Nov 2011 17:28:29 +0000 (+0100)
Subject: Ensure that Py_UCS4 is 32 bits and Py_UCS2 is 16 bits
X-Git-Tag: v3.3.0a1~799
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c8bbbbb0c24350eca5e8bfb8223d3f01c90646c;p=python

Ensure that Py_UCS4 is 32 bits and Py_UCS2 is 16 bits
---

diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index 88bb7c87ce..2323c650aa 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -117,15 +117,20 @@ typedef wchar_t Py_UNICODE;
 
 /* Py_UCS4 and Py_UCS2 are typedefs for the respective
    unicode representations. */
-#if SIZEOF_INT >= 4
+#if SIZEOF_INT == 4
 typedef unsigned int Py_UCS4;
-#elif SIZEOF_LONG >= 4
+#elif SIZEOF_LONG == 4
 typedef unsigned long Py_UCS4;
 #else
 #error "Could not find a proper typedef for Py_UCS4"
 #endif
 
+#if SIZEOF_SHORT == 2
 typedef unsigned short Py_UCS2;
+#else
+#error "Could not find a proper typedef for Py_UCS2"
+#endif
+
 typedef unsigned char Py_UCS1;
 
 /* --- Internal Unicode Operations ---------------------------------------- */