Patch #554716: Use __va_copy where available.

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 0556c5a2a54d5819f5dcfd4598ff688ce2473e45..a9be8b2f9c53ca32e3a0cb68daa59301518d1a20 100644 (file)
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1792,8 +1792,12 @@ objargs_mktuple(va_list va)
 
 #ifdef VA_LIST_IS_ARRAY
        memcpy(countva, va, sizeof(va_list));
+#else
+#ifdef __va_copy
+       __va_copy(countva, va);
 #else
        countva = va;
+#endif
 #endif
 
        while (((PyObject *)va_arg(countva, PyObject *)) != NULL)

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index dd74569fda47ddc60ceff72e4ed6c35be246f06a..b73eaa8bfaf751cb0c4b4845850ed1c4f0ddfdac 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -173,8 +173,12 @@ PyString_FromFormatV(const char *format, va_list vargs)
 
 #ifdef VA_LIST_IS_ARRAY
        memcpy(count, vargs, sizeof(va_list));
+#else
+#ifdef  __va_copy
+       __va_copy(count, vargs);
 #else
        count = vargs;
+#endif
 #endif
        /* step 1: figure out how large a buffer we need */
        for (f = format; *f; f++) {

diff --git a/Python/getargs.c b/Python/getargs.c
index 9df2a2e56672dda3af83ae6b801bc291f5e21924..08b79e474a5225354199d53b56d086da2abf6a46 100644 (file)
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -60,8 +60,12 @@ PyArg_VaParse(PyObject *args, char *format, va_list va)
 
 #ifdef VA_LIST_IS_ARRAY
        memcpy(lva, va, sizeof(va_list));
+#else
+#ifdef __va_copy
+       __va_copy(lva, va);
 #else
        lva = va;
+#endif
 #endif
 
        return vgetargs1(args, format, &lva, 0);

diff --git a/Python/modsupport.c b/Python/modsupport.c
index cff9a02aa4c0a6ab1e743e0aa781784b6efdb332..437469b10a6a889186e7002a173c62c63ac223f1 100644 (file)
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -410,8 +410,12 @@ Py_VaBuildValue(char *format, va_list va)
 
 #ifdef VA_LIST_IS_ARRAY
        memcpy(lva, va, sizeof(va_list));
+#else
+#ifdef __va_copy
+       __va_copy(lva, va);
 #else
        lva = va;
+#endif
 #endif
 
        if (n < 0)