summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-06-26 22:40:47 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-06-26 22:40:47 (GMT)
commit208efe56401ec6a1d7eef874fcc5848084d15692 (patch)
treea47db29b3aa0832106adaa5f7d9817ae3485b72f
parente77f2e27987f99683b809981cb1230bfc566e7b7 (diff)
downloadcpython-208efe56401ec6a1d7eef874fcc5848084d15692.zip
cpython-208efe56401ec6a1d7eef874fcc5848084d15692.tar.gz
cpython-208efe56401ec6a1d7eef874fcc5848084d15692.tar.bz2
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).
-rw-r--r--Modules/_testcapimodule.c1
-rw-r--r--PC/config.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 1c5b0e5..6ff32b5 100644
--- 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 e146469..3b81a45 100644
--- 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