mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Martin v. Löwis 2009-01-02 20:40:14 +00:00
parent 5344c99734
commit 9ac4927125
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -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.

8
Modules/cPickle.c
View File

@ -17,6 +17,14 @@ PyDoc_STRVAR(cPickle_module_documentation,
/* Bump this when new opcodes are added to the pickle protocol. */
#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.