[pypy-commit] pypy default: Fix.

arigo noreply at buildbot.pypy.org
Wed May 11 15:58:09 CEST 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r44075:faf5bcf4fc76
Date: 2011-05-11 15:33 +0200
http://bitbucket.org/pypy/pypy/changeset/faf5bcf4fc76/

Log:	Fix.

diff --git a/pypy/translator/c/src/cjkcodecs/multibytecodec.h b/pypy/translator/c/src/cjkcodecs/multibytecodec.h
--- a/pypy/translator/c/src/cjkcodecs/multibytecodec.h
+++ b/pypy/translator/c/src/cjkcodecs/multibytecodec.h
@@ -8,11 +8,15 @@
 #include <unistd.h>
 #include <assert.h>
 
+#ifndef Py_UNICODE_SIZE
 #define Py_UNICODE_SIZE  4
-typedef uint32_t ucs4_t, Py_UNICODE;
-typedef uint16_t ucs2_t, DBCHAR;
+typedef uint32_t Py_UNICODE;
 typedef ssize_t Py_ssize_t;
 #define PY_SSIZE_T_MAX   ((Py_ssize_t)(((size_t) -1) >> 1))
+#endif
+
+typedef uint32_t ucs4_t;
+typedef uint16_t ucs2_t, DBCHAR;
 
 
 typedef union {


More information about the pypy-commit mailing list