]> granicus.if.org Git - python/commitdiff
Ensure that Py_UCS4 is 32 bits and Py_UCS2 is 16 bits
authorVictor Stinner <victor.stinner@haypocalc.com>
Sun, 20 Nov 2011 17:28:29 +0000 (18:28 +0100)
committerVictor Stinner <victor.stinner@haypocalc.com>
Sun, 20 Nov 2011 17:28:29 +0000 (18:28 +0100)
Include/unicodeobject.h

index 88bb7c87ce0c376885385782893bb4f61dae8673..2323c650aa66f50032b47f888b9fca9fc031cd79 100644 (file)
@@ -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 ---------------------------------------- */