From: Antoine Pitrou <solipsis@pitrou.net> Date: Thu, 22 Mar 2012 13:42:18 +0000 (+0100) Subject: Issue #14387: Do not include accu.h from Python.h. X-Git-Tag: v3.3.0a2~90 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0acb411ef6790b5ecfbd8b6be9c2d0cc1aeb4d5;p=python Issue #14387: Do not include accu.h from Python.h. --- d0acb411ef6790b5ecfbd8b6be9c2d0cc1aeb4d5 diff --cc Modules/_io/stringio.c index c4794c9474,c9d14b114b..a1c31c0856 --- a/Modules/_io/stringio.c +++ b/Modules/_io/stringio.c @@@ -1,6 -1,6 +1,7 @@@ #define PY_SSIZE_T_CLEAN #include "Python.h" #include "structmember.h" ++#include "accu.h" #include "_iomodule.h" /* Implementation note: the buffer is always at least one character longer diff --cc Modules/_json.c index cafd5a9e11,09248739c0..95c658ca7c --- a/Modules/_json.c +++ b/Modules/_json.c @@@ -1,5 -1,5 +1,7 @@@ #include "Python.h" #include "structmember.h" ++#include "accu.h" ++ #if PY_VERSION_HEX < 0x02060000 && !defined(Py_TYPE) #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) #endif diff --cc Objects/stringlib/unicode_format.h index f05847a8bd,6c7adcb01e..68070889e9 --- a/Objects/stringlib/unicode_format.h +++ b/Objects/stringlib/unicode_format.h @@@ -1,7 -1,15 +1,8 @@@ /* - string_format.h -- implementation of string.format(). - - It uses the Objects/stringlib conventions, so that it can be - compiled for both unicode and string objects. + unicode_format.h -- implementation of str.format(). */ - -/* Defines for Python 2.6 compatibility */ -#if PY_VERSION_HEX < 0x03000000 -#define PyLong_FromSsize_t _PyLong_FromSsize_t -#endif ++#include "accu.h" /* Defines for more efficiently reallocating the string buffer */ #define INITIAL_SIZE_INCREMENT 100