[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2 (Issue #14387)

[kristjan.jonsson]

http://hg.python.org/cpython/rev/780aaa7b4b62
changeset:   75891:780aaa7b4b62
parent:      75889:449a0eae0415
parent:      75890:aff7ff2aae8c
user:        Kristján Valur Jónsson <kristjan at ccpgames.com>
date:        Thu Mar 22 23:13:48 2012 +0000
summary:
  Merge with 3.2 (Issue #14387)

files:
  Include/accu.h |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Include/accu.h b/Include/accu.h
--- 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 */

-- 
Repository URL: http://hg.python.org/cpython