diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2002-07-28 10:23:27 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2002-07-28 10:23:27 (GMT) |
| commit | 75d2d94e0f049162c6ef353a89c5703eb78eaaf6 (patch) | |
| tree | 7dd95594c03ae6b85569ec52c6c30eb0c6900bc7 | |
| parent | 09c35f78fe57fd0edbccad4423ecbbf8ca845e09 (diff) | |
| download | cpython-75d2d94e0f049162c6ef353a89c5703eb78eaaf6.zip cpython-75d2d94e0f049162c6ef353a89c5703eb78eaaf6.tar.gz cpython-75d2d94e0f049162c6ef353a89c5703eb78eaaf6.tar.bz2 | |
Patch #554716: Use __va_copy where available.
| -rw-r--r-- | Objects/abstract.c | 4 | ||||
| -rw-r--r-- | Objects/stringobject.c | 4 | ||||
| -rw-r--r-- | Python/getargs.c | 4 | ||||
| -rw-r--r-- | Python/modsupport.c | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 1f9b603..fc73a9f 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1793,8 +1793,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) ++n; diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 5e40524..bf548cd 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -156,8 +156,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++) { if (*f == '%') { diff --git a/Python/getargs.c b/Python/getargs.c index 280ffc3..cc0409d 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -61,8 +61,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 f4f8298..1f8ef07 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -418,8 +418,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) return NULL; |