diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-01-02 20:40:14 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-01-02 20:40:14 (GMT) |
| commit | 9ac4927125d0de98b7393afc5b13cfa4e3ce75f2 (patch) | |
| tree | 684bd9269b38271922edff3661b3d3575ddd6812 | |
| parent | 5344c99734af01d11c2eca19f308640c5035dd9a (diff) | |
| download | cpython-9ac4927125d0de98b7393afc5b13cfa4e3ce75f2.zip cpython-9ac4927125d0de98b7393afc5b13cfa4e3ce75f2.tar.gz cpython-9ac4927125d0de98b7393afc5b13cfa4e3ce75f2.tar.bz2 | |
Issue #4051: Prevent conflict of UNICODE macros in cPickle.
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/cPickle.c | 8 |
2 files changed, 10 insertions, 0 deletions
@@ -286,6 +286,8 @@ C-API Extension Modules ----------------- +- Issue #4051: Prevent conflict of UNICODE macros in cPickle. + - Issue #4228: Pack negative values the same way as 2.4 in struct's L format. - Issue #1040026: Fix os.times result on systems where HZ is incorrect. 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 @@ PyDoc_STRVAR(cPickle_module_documentation, #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. */ |