diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-01-02 20:40:14 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-01-02 20:40:14 +0000 |
| commit | 9ac4927125d0de98b7393afc5b13cfa4e3ce75f2 (patch) | |
| tree | 684bd9269b38271922edff3661b3d3575ddd6812 /Modules/cPickle.c | |
| parent | 5344c99734af01d11c2eca19f308640c5035dd9a (diff) | |
| download | cpython-git-9ac4927125d0de98b7393afc5b13cfa4e3ce75f2.tar.gz | |
Issue #4051: Prevent conflict of UNICODE macros in cPickle.
Diffstat (limited to 'Modules/cPickle.c')
| -rw-r--r-- | Modules/cPickle.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/cPickle.c b/Modules/cPickle.c index 18baee1c39..7f836c3126 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. */ |