Bug #1290333: Added a workaround for cjkcodecs' _codecs_cn module

build problem on AIX.

diff --git a/Misc/NEWS b/Misc/NEWS
index a630755b731e316b257b902e196bc5c577203f63..01ddf7114d1601ad2d7a63b8b7092a6ebbd0597c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,9 @@ Core and builtins
 Extension Modules
 -----------------
 
+- Bug #1290333: Added a workaround for cjkcodecs' _codecs_cn build
+  problem on AIX.
+
 - Bug #869197: os.setgroups rejects long integer arguments
 
 - Bug #1344508, Fix UNIX mmap leaking file descriptors

diff --git a/Modules/cjkcodecs/_codecs_cn.c b/Modules/cjkcodecs/_codecs_cn.c
index ac36b64372ec7c46ea9a01e7f205c7f8e554e5eb..9a885bbb3c3f6d01b0973b7abbf7289b99db9594 100644 (file)
--- a/Modules/cjkcodecs/_codecs_cn.c
+++ b/Modules/cjkcodecs/_codecs_cn.c
@@ -8,6 +8,14 @@
 #include "cjkcodecs.h"
 #include "mappings_cn.h"
 
+/**
+ * hz is predefined as 100 on AIX. So we undefine it to avoid
+ * conflict against hz codec's.
+ */
+#ifdef _AIX
+#undef hz
+#endif
+
 #define GBK_PREDECODE(dc1, dc2, assi) \
        if ((dc1) == 0xa1 && (dc2) == 0xaa) (assi) = 0x2014; \
        else if ((dc1) == 0xa8 && (dc2) == 0x44) (assi) = 0x2015; \