Merge with 3.2 (Issue #14387)

2012-03-22 23:13:48 +00:00 · 2012-03-22 23:13:48 +00:00 · 192195a4fc
parent 2ac82f8dc9 b81e5388b6
commit 192195a4fc
1 changed files with 2 additions and 0 deletions
--- 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 */