Windows build broke from recent Unicode changes -- need to #define

SIZEOF_SHORT by hand here.
Also added dynamic check that SIZEOF_SHORT is correct for the platform (in
_testcapimodule).

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 1c5b0e5aa665d3449a9f40b425a82de79a220a58..6ff32b5abedd45dec05db098ecdf60609cfcd8da 100644 (file)
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -52,6 +52,7 @@ test_config(PyObject *self, PyObject *args)
            if (FATNAME != sizeof(TYPE)) \
                return sizeof_error(#FATNAME, #TYPE, FATNAME, sizeof(TYPE))
 
+       CHECK_SIZEOF(SIZEOF_SHORT, short);
        CHECK_SIZEOF(SIZEOF_INT, int);
        CHECK_SIZEOF(SIZEOF_LONG, long);
        CHECK_SIZEOF(SIZEOF_VOID_P, void*);

diff --git a/PC/config.h b/PC/config.h
index e146469c36c262e1ebd452549ba7dd55f889f7fb..3b81a450a4d09b320d3872e3fa215abaa607a42a 100644 (file)
--- a/PC/config.h
+++ b/PC/config.h
@@ -344,6 +344,7 @@ typedef unsigned long uintptr_t;
 #define Py_DEBUG
 #endif
 
+#define SIZEOF_SHORT 2
 #define SIZEOF_INT 4
 #define SIZEOF_LONG 4
 #define SIZEOF_LONG_LONG 8