commit 9ac4927125d0de98b7393afc5b13cfa4e3ce75f2
author Martin v. Löwis <martin@v.loewis.de> Fri Jan 02 20:40:14 2009 +0000
committer Martin v. Löwis <martin@v.loewis.de> Fri Jan 02 20:40:14 2009 +0000
tree 684bd9269b38271922edff3661b3d3575ddd6812
parent 5344c99734af01d11c2eca19f308640c5035dd9a

Issue #4051: Prevent conflict of UNICODE macros in cPickle.

Modules/cPickle.c

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 18baee1..7f836c3 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -18,6 +18,14 @@
 #define HIGHEST_PROTOCOL 2
 
 /*
+ * Note: The UNICODE macro controls the TCHAR meaning of the win32 API. Since
+ * all headers have already been included here, we can safely redefine it.
+ */
+#ifdef UNICODE
+#  undef UNICODE
+#endif
+
+/*
  * Pickle opcodes.  These must be kept in synch with pickle.py.  Extensive
  * docs are in pickletools.py.
  */