Merge with 3.2 (Issue #14387)

This commit is contained in:
Kristján Valur Jónsson 2012-03-22 23:13:48 +00:00
commit 192195a4fc
1 changed files with 2 additions and 0 deletions

View File

@ -16,6 +16,8 @@
extern "C" { extern "C" {
#endif #endif
#undef small /* defined by some Windows headers */
typedef struct { typedef struct {
PyObject *large; /* A list of previously accumulated large strings */ PyObject *large; /* A list of previously accumulated large strings */
PyObject *small; /* Pending small strings */ PyObject *small; /* Pending small strings */