diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-08-11 17:31:17 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-08-11 17:31:17 (GMT) |
| commit | f0f45142d52436d26ce8ed888c73496949caae90 (patch) | |
| tree | 53a4f3c197b87cb8afa33b87de48b06d5859513d /Objects/unicodeobject.c | |
| parent | 3a879e8a277e61195f5379862ef47f3ca9c69f4b (diff) | |
| download | cpython-f0f45142d52436d26ce8ed888c73496949caae90.zip cpython-f0f45142d52436d26ce8ed888c73496949caae90.tar.gz cpython-f0f45142d52436d26ce8ed888c73496949caae90.tar.bz2 | |
Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99
va_copy, but available on all python platforms. Untabified a few
unrelated files.
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 478f9a9..849f33e 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -755,15 +755,7 @@ PyUnicode_FromFormatV(const char *format, va_list vargs) char fmt[61]; /* should be enough for %0width.precisionlld */ const char *copy; -#ifdef VA_LIST_IS_ARRAY - Py_MEMCPY(count, vargs, sizeof(va_list)); -#else -#ifdef __va_copy - __va_copy(count, vargs); -#else - count = vargs; -#endif -#endif + Py_VA_COPY(count, vargs); /* step 1: count the number of %S/%R/%A/%s format specifications * (we call PyObject_Str()/PyObject_Repr()/PyObject_ASCII()/ * PyUnicode_DecodeUTF8() for these objects once during step 3 and put the |