diff options
author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-03-22 23:13:48 (GMT) |
---|---|---|
committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2012-03-22 23:13:48 (GMT) |
commit | 192195a4fcf3aec27a43169df901667b21ea763a (patch) | |
tree | 8804ce1187378299d10e06df2f2490074efcb4ce /Include | |
parent | 2ac82f8dc9700ec64797026d8634e192db0af1d0 (diff) | |
parent | b81e5388b6373ee10f5e813b91d6a0c493620d57 (diff) | |
download | cpython-192195a4fcf3aec27a43169df901667b21ea763a.zip cpython-192195a4fcf3aec27a43169df901667b21ea763a.tar.gz cpython-192195a4fcf3aec27a43169df901667b21ea763a.tar.bz2 |
Merge with 3.2 (Issue #14387)
Diffstat (limited to 'Include')
-rw-r--r-- | Include/accu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Include/accu.h b/Include/accu.h index 9655d37..3636ea6 100644 --- a/Include/accu.h +++ b/Include/accu.h @@ -16,6 +16,8 @@ extern "C" { #endif +#undef small /* defined by some Windows headers */ + typedef struct { PyObject *large; /* A list of previously accumulated large strings */ PyObject *small; /* Pending small strings */ |