Author: Maciej Fijalkowski <[email protected]> Branch: single-run Changeset: r279:323096e0ac0e Date: 2014-10-24 16:03 +0200 http://bitbucket.org/pypy/benchmarks/changeset/323096e0ac0e/
Log: merge diff --git a/lib/pypy/include/pypy_decl.h b/lib/pypy/include/pypy_decl.h --- a/lib/pypy/include/pypy_decl.h +++ b/lib/pypy/include/pypy_decl.h @@ -513,17 +513,17 @@ PyAPI_DATA(PyTypeObject) PySlice_Type; PyAPI_DATA(PyObject*) PyExc_IOError; PyAPI_DATA(PyObject*) PyExc_RuntimeError; -PyAPI_DATA(PyObject*) PyExc_SystemError; +PyAPI_DATA(PyObject*) PyExc_AttributeError; PyAPI_DATA(PyObject*) PyExc_NameError; PyAPI_DATA(PyObject*) PyExc_MemoryError; PyAPI_DATA(PyObject*) PyExc_SystemExit; PyAPI_DATA(PyTypeObject) PyModule_Type; PyAPI_DATA(PyTypeObject) PyBaseObject_Type; -PyAPI_DATA(PyObject*) PyExc_UnicodeTranslateError; -PyAPI_DATA(PyObject*) PyExc_UnicodeWarning; +PyAPI_DATA(PyObject*) PyExc_FloatingPointError; +PyAPI_DATA(PyObject*) PyExc_UnicodeDecodeError; PyAPI_DATA(PyObject*) PyExc_Exception; PyAPI_DATA(PyObject*) PyExc_TypeError; -PyAPI_DATA(PyObject*) PyExc_AttributeError; +PyAPI_DATA(PyObject*) PyExc_SystemError; PyAPI_DATA(PyObject*) PyExc_ReferenceError; PyAPI_DATA(PyTypeObject) PyNotImplemented_Type; PyAPI_DATA(PyTypeObject) PySet_Type; @@ -555,14 +555,14 @@ PyAPI_DATA(PyObject*) PyExc_BytesWarning; PyAPI_DATA(PyObject*) PyExc_DeprecationWarning; PyAPI_DATA(PyObject*) PyExc_SyntaxError; -PyAPI_DATA(PyObject*) PyExc_UnicodeDecodeError; +PyAPI_DATA(PyObject*) PyExc_UnicodeWarning; PyAPI_DATA(PyObject*) PyExc_ZeroDivisionError; PyAPI_DATA(PyTypeObject) PyFloat_Type; -PyAPI_DATA(PyTypeObject) PyBaseString_Type; +PyAPI_DATA(PyObject*) PyExc_RuntimeWarning; PyAPI_DATA(PyObject) _Py_NoneStruct; +PyAPI_DATA(PyObject*) PyExc_IndentationError; +PyAPI_DATA(PyObject*) PyExc_AssertionError; PyAPI_DATA(PyObject*) PyExc_GeneratorExit; -PyAPI_DATA(PyObject*) PyExc_AssertionError; -PyAPI_DATA(PyObject*) PyExc_RuntimeWarning; PyAPI_DATA(PyObject*) PyExc_ImportWarning; PyAPI_DATA(PyObject*) PyExc_UnicodeEncodeError; PyAPI_DATA(PyTypeObject) PyInt_Type; @@ -571,8 +571,8 @@ PyAPI_DATA(PyObject*) PyExc_OSError; PyAPI_DATA(PyObject*) PyExc_KeyError; PyAPI_DATA(PyObject*) PyExc_SyntaxWarning; +PyAPI_DATA(PyTypeObject) PyBaseString_Type; PyAPI_DATA(PyObject*) PyExc_StopIteration; -PyAPI_DATA(PyObject*) PyExc_IndentationError; PyAPI_DATA(PyObject*) PyExc_NotImplementedError; PyAPI_DATA(PyObject*) PyExc_ImportError; PyAPI_DATA(PyDateTime_CAPI*) PyDateTimeAPI; @@ -582,7 +582,7 @@ PyAPI_DATA(PyTypeObject) PyClass_Type; PyAPI_DATA(PyTypeObject) PyType_Type; PyAPI_DATA(PyTypeObject) PyMemoryView_Type; -PyAPI_DATA(PyObject*) PyExc_FloatingPointError; +PyAPI_DATA(PyObject*) PyExc_UnicodeTranslateError; PyAPI_DATA(PyObject*) PyExc_LookupError; PyAPI_DATA(PyObject*) PyExc_EOFError; PyAPI_DATA(PyObject*) PyExc_BufferError; diff --git a/lib/pypy/rpython/translator/c/src/signals.o b/lib/pypy/rpython/translator/c/src/signals.o index 166016f96874014a34535131bd7cfed3aabe09eb..b143fa4f3acc0359f3337c6009657837f3644396 GIT binary patch [cut] diff --git a/lib/pypy/rpython/translator/c/src/stacklet/stacklet.o b/lib/pypy/rpython/translator/c/src/stacklet/stacklet.o index e42497399f1f975b42e62fbf236498014c21f654..d53aba6966f53ffac29198a25cb637ace5a6c402 GIT binary patch [cut] diff --git a/lib/pypy/rpython/translator/c/src/thread.o b/lib/pypy/rpython/translator/c/src/thread.o index 9b7dcc7cb6e9c6eb94216acf121fbcd5b32297e5..c73a354271b3543fd81a984cc2deaae6bae4d576 GIT binary patch [cut] _______________________________________________ pypy-commit mailing list [email protected] https://mail.python.org/mailman/listinfo/pypy-commit
