]> granicus.if.org Git - python/commitdiff
Removed merge glitch from stringlib/find.h as explained on the python committers...
authorChristian Heimes <christian@cheimes.de>
Thu, 28 Aug 2008 14:55:10 +0000 (14:55 +0000)
committerChristian Heimes <christian@cheimes.de>
Thu, 28 Aug 2008 14:55:10 +0000 (14:55 +0000)
This also fixes bug #3713

Objects/stringlib/find.h

index ac37b407a505c1190bd3d30ffddca10aa73b0a4d..46337e1773eeb59978abeac6da2fbde72d140d55 100644 (file)
@@ -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)