From: Christian Heimes <christian@cheimes.de> Date: Thu, 28 Aug 2008 14:55:10 +0000 (+0000) Subject: Removed merge glitch from stringlib/find.h as explained on the python committers... X-Git-Tag: v3.0rc1~159 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f3c5616ccb880f8b5602c2da5c8951b55e4e9dd;p=python 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 --- diff --git a/Objects/stringlib/find.h b/Objects/stringlib/find.h index ac37b407a5..46337e1773 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)