diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-02 21:40:36 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-02 21:40:36 (GMT) |
| commit | da2ecaf3349d564ef0392183d86270eea5cdb439 (patch) | |
| tree | d30ed807e0e325a492f999576bf19fd370b0dbda /Objects/stringlib/unicodedefs.h | |
| parent | 2952148dd246b67ca88a68c44819a208d0d6624a (diff) | |
| download | cpython-da2ecaf3349d564ef0392183d86270eea5cdb439.zip cpython-da2ecaf3349d564ef0392183d86270eea5cdb439.tar.gz cpython-da2ecaf3349d564ef0392183d86270eea5cdb439.tar.bz2 | |
Merged revisions 77241 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77241 | antoine.pitrou | 2010-01-02 22:12:58 +0100 (sam., 02 janv. 2010) | 4 lines
Issue #7462: Implement the stringlib fast search algorithm for the `rfind`,
`rindex`, `rsplit` and `rpartition` methods. Patch by Florent Xicluna.
........
Diffstat (limited to 'Objects/stringlib/unicodedefs.h')
| -rw-r--r-- | Objects/stringlib/unicodedefs.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/Objects/stringlib/unicodedefs.h b/Objects/stringlib/unicodedefs.h index c23c392..a4d2144 100644 --- a/Objects/stringlib/unicodedefs.h +++ b/Objects/stringlib/unicodedefs.h @@ -35,23 +35,4 @@ #define STRINGLIB_WANT_CONTAINS_OBJ 1 -/* STRINGLIB_CMP was defined as: - -Py_LOCAL_INLINE(int) -STRINGLIB_CMP(const Py_UNICODE* str, const Py_UNICODE* other, Py_ssize_t len) -{ - if (str[0] != other[0]) - return 1; - return memcmp((void*) str, (void*) other, len * sizeof(Py_UNICODE)); -} - -but unfortunately that gives a error if the function isn't used in a file that -includes this file. So, reluctantly convert it to a macro instead. */ - -#define STRINGLIB_CMP(str, other, len) \ - (((str)[0] != (other)[0]) ? \ - 1 : \ - memcmp((void*) (str), (void*) (other), (len) * sizeof(Py_UNICODE))) - - #endif /* !STRINGLIB_UNICODEDEFS_H */ |