diff options
| author | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:16:58 -0800 |
|---|---|---|
| committer | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:16:58 -0800 |
| commit | da79bcf8ac7ae72218ab023e1ed54390bc1a3a27 (patch) | |
| tree | 74845e2dbd9521d9748b9c32f1922f4123083bf3 /Objects/stringlib/join.h | |
| parent | e3c7e835bdfc97750eb9b7fc0ad2493108c2d438 (diff) | |
| parent | 1fe806ac56f8b83694d24ab604eb695d00bc8497 (diff) | |
| download | cpython-da79bcf8ac7ae72218ab023e1ed54390bc1a3a27.tar.gz | |
Issue #29371: merge with 3.5
Diffstat (limited to 'Objects/stringlib/join.h')
| -rw-r--r-- | Objects/stringlib/join.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/stringlib/join.h b/Objects/stringlib/join.h index cbf81be170..6f314e1524 100644 --- a/Objects/stringlib/join.h +++ b/Objects/stringlib/join.h @@ -1,6 +1,6 @@ /* stringlib: bytes joining implementation */ -#if STRINGLIB_SIZEOF_CHAR != 1 +#if STRINGLIB_IS_UNICODE #error join.h only compatible with byte-wise strings #endif @@ -107,7 +107,7 @@ STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable) for (i = 0; i < nbufs; i++) { Py_ssize_t n = buffers[i].len; char *q = buffers[i].buf; - Py_MEMCPY(p, q, n); + memcpy(p, q, n); p += n; } goto done; @@ -116,12 +116,12 @@ STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable) Py_ssize_t n; char *q; if (i) { - Py_MEMCPY(p, sepstr, seplen); + memcpy(p, sepstr, seplen); p += seplen; } n = buffers[i].len; q = buffers[i].buf; - Py_MEMCPY(p, q, n); + memcpy(p, q, n); p += n; } goto done; |