diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-08-28 14:55:10 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-08-28 14:55:10 (GMT) |
| commit | 4f3c5616ccb880f8b5602c2da5c8951b55e4e9dd (patch) | |
| tree | 1895567b0f04b9a2dd5154c149a81685000b424f /Objects | |
| parent | ff869fa0f05413bb2da2b56c4578d3fb33c832a3 (diff) | |
| download | cpython-4f3c5616ccb880f8b5602c2da5c8951b55e4e9dd.zip cpython-4f3c5616ccb880f8b5602c2da5c8951b55e4e9dd.tar.gz cpython-4f3c5616ccb880f8b5602c2da5c8951b55e4e9dd.tar.bz2 | |
Removed merge glitch from stringlib/find.h as explained on the python committers list. The FROM_BYTEARRAY isn't required here.
This also fixes bug #3713
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/stringlib/find.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/stringlib/find.h b/Objects/stringlib/find.h index ac37b40..46337e1 100644 --- a/Objects/stringlib/find.h +++ b/Objects/stringlib/find.h @@ -90,7 +90,7 @@ stringlib_rfind_slice(const STRINGLIB_CHAR* str, Py_ssize_t str_len, return stringlib_rfind(str + start, end - start, sub, sub_len, start); } -#ifdef STRINGLIB_WANT_CONTAINS_OBJ && !defined(FROM_BYTEARRAY) +#ifdef STRINGLIB_WANT_CONTAINS_OBJ Py_LOCAL_INLINE(int) stringlib_contains_obj(PyObject* str, PyObject* sub) |