]> granicus.if.org Git - python/commitdiff
Issue #14387: Do not include accu.h from Python.h.
authorAntoine Pitrou <solipsis@pitrou.net>
Thu, 22 Mar 2012 13:42:18 +0000 (14:42 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Thu, 22 Mar 2012 13:42:18 +0000 (14:42 +0100)
1  2 
Include/Python.h
Misc/NEWS
Modules/_io/stringio.c
Modules/_json.c
Objects/listobject.c
Objects/stringlib/unicode_format.h
Objects/tupleobject.c

Simple merge
diff --cc Misc/NEWS
Simple merge
index c4794c9474e01f2da0766f2e8b96ce66c5e70baf,c9d14b114b181786f582a1840a370ca4b5e62279..a1c31c08567b3c23d77da40f1ad6c8f2ad492ec3
@@@ -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 cafd5a9e1170a1d04e6acd50e62f593cc7f5de08,09248739c0f30695a199b9af41624cacb4df58aa..95c658ca7c5c861e16b12f4ccda3928322e36004
@@@ -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
Simple merge
index f05847a8bd6bfb2faa9b27fa8b27d13c776b6081,6c7adcb01ed89d2069903f7a673656860d423c24..68070889e94838e522150383e01275ab623c77da
@@@ -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
Simple merge