Remove definition of PY_UNICODE_TYPE from pyconfig.h, allowing the

definition in unicodeobject.h to be used, giving us the desired
wchar_t in place of 'unsigned short'.  As discussed on python-dev.

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 91cc823b07eb7fde98c65ac5810a3776fe38a044..6936d65ca9c6b2579bf92433c271f5e5e334f5d5 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -491,22 +491,13 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 /* Define if you want to have a Unicode type. */
 #define Py_USING_UNICODE
 
-/* Define as the integral type used for Unicode representation. */
-#define PY_UNICODE_TYPE unsigned short
-
 /* Define as the size of the unicode type. */
-#define Py_UNICODE_SIZE SIZEOF_SHORT
-
-/* Define if you have a useable wchar_t type defined in wchar.h; useable
-   means wchar_t must be 16-bit unsigned type. (see
-   Include/unicodeobject.h). */
-#if Py_UNICODE_SIZE == 2
-#define HAVE_USABLE_WCHAR_T
+/* This is enough for unicodeobject.h to do the "right thing" on Windows. */
+#define Py_UNICODE_SIZE 2
 
 /* Define to indicate that the Python Unicode representation can be passed
    as-is to Win32 Wide API.  */
 #define Py_WIN_WIDE_FILENAMES
-#endif
 
 /* Use Python's own small-block memory-allocator. */
 #define WITH_PYMALLOC 1