Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

python{2+3}: Use gnu_printf in format to get working %z formatting.

Browse Source
This commit is contained in:
Alexpux
2014-03-02 10:09:33 +04:00
parent 363ca51fd3
commit 2d7cd2e51e
4 changed files with 141 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
mingw-w64-python3/0850-use-gnu_printf-in-format.patch Normal file
View File

@@ -0,0 +1,60 @@
diff -Naur Python-3.3.3-orig/Include/bytesobject.h Python-3.3.3/Include/bytesobject.h
--- Python-3.3.3-orig/Include/bytesobject.h 2013-11-17 11:22:23.000000000 +0400
+++ Python-3.3.3/Include/bytesobject.h 2014-03-02 01:37:06.454400000 +0400
@@ -52,9 +52,9 @@
PyAPI_FUNC(PyObject *) PyBytes_FromString(const char *);
PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *);
PyAPI_FUNC(PyObject *) PyBytes_FromFormatV(const char*, va_list)
- Py_GCC_ATTRIBUTE((format(printf, 1, 0)));
+ Py_GCC_ATTRIBUTE((format(gnu_printf, 1, 0)));
PyAPI_FUNC(PyObject *) PyBytes_FromFormat(const char*, ...)
- Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
+ Py_GCC_ATTRIBUTE((format(gnu_printf, 1, 2)));
PyAPI_FUNC(Py_ssize_t) PyBytes_Size(PyObject *);
PyAPI_FUNC(char *) PyBytes_AsString(PyObject *);
PyAPI_FUNC(PyObject *) PyBytes_Repr(PyObject *, int);
diff -Naur Python-3.3.3-orig/Include/pgenheaders.h Python-3.3.3/Include/pgenheaders.h
--- Python-3.3.3-orig/Include/pgenheaders.h 2013-11-17 11:22:24.000000000 +0400
+++ Python-3.3.3/Include/pgenheaders.h 2014-03-02 01:37:45.844400000 +0400
@@ -10,9 +10,9 @@
#include "Python.h"
PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...)
- Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
+ Py_GCC_ATTRIBUTE((format(gnu_printf, 1, 2)));
PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...)
- Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
+ Py_GCC_ATTRIBUTE((format(gnu_printf, 1, 2)));
#define addarc _Py_addarc
#define addbit _Py_addbit
diff -Naur Python-3.3.3-orig/Include/pyerrors.h Python-3.3.3/Include/pyerrors.h
--- Python-3.3.3-orig/Include/pyerrors.h 2013-11-17 11:22:24.000000000 +0400
+++ Python-3.3.3/Include/pyerrors.h 2014-03-02 01:38:21.428000000 +0400
@@ -416,9 +416,9 @@
#include <stdarg.h>
PyAPI_FUNC(int) PyOS_snprintf(char *str, size_t size, const char *format, ...)
- Py_GCC_ATTRIBUTE((format(printf, 3, 4)));
+ Py_GCC_ATTRIBUTE((format(gnu_printf, 3, 4)));
PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char *format, va_list va)
- Py_GCC_ATTRIBUTE((format(printf, 3, 0)));
+ Py_GCC_ATTRIBUTE((format(gnu_printf, 3, 0)));
#ifdef __cplusplus
}
diff -Naur Python-3.3.3-orig/Include/sysmodule.h Python-3.3.3/Include/sysmodule.h
--- Python-3.3.3-orig/Include/sysmodule.h 2013-11-17 11:22:24.000000000 +0400
+++ Python-3.3.3/Include/sysmodule.h 2014-03-02 01:38:59.835200000 +0400
@@ -14,9 +14,9 @@
PyAPI_FUNC(void) PySys_SetPath(const wchar_t *);
PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...)
- Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
+ Py_GCC_ATTRIBUTE((format(gnu_printf, 1, 2)));
PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...)
- Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
+ Py_GCC_ATTRIBUTE((format(gnu_printf, 1, 2)));
PyAPI_FUNC(void) PySys_FormatStdout(const char *format, ...);
PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...);