diff options
| author | Martin v. L?wis <martin@v.loewis.de> | 2012-04-20 14:37:17 +0200 |
|---|---|---|
| committer | Martin v. L?wis <martin@v.loewis.de> | 2012-04-20 14:37:17 +0200 |
| commit | b467205669cae187c9bbce311069c4875518bfae (patch) | |
| tree | ce7686f020917e8883d1818b8fadece2cc15fa06 /Objects/stringlib/count.h | |
| parent | f235cad91035d648e09ae7a1867fc9aa49ae8963 (diff) | |
| parent | 2c826ad61cf991d15646ae7bfac2d0cb34535cd8 (diff) | |
| download | cpython-b467205669cae187c9bbce311069c4875518bfae.tar.gz | |
merge 3.2: issue 14629
Diffstat (limited to 'Objects/stringlib/count.h')
| -rw-r--r-- | Objects/stringlib/count.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Objects/stringlib/count.h b/Objects/stringlib/count.h index de34f96b3e..f48500bf56 100644 --- a/Objects/stringlib/count.h +++ b/Objects/stringlib/count.h @@ -1,14 +1,11 @@ /* stringlib: count implementation */ -#ifndef STRINGLIB_COUNT_H -#define STRINGLIB_COUNT_H - #ifndef STRINGLIB_FASTSEARCH_H #error must include "stringlib/fastsearch.h" before including this module #endif Py_LOCAL_INLINE(Py_ssize_t) -stringlib_count(const STRINGLIB_CHAR* str, Py_ssize_t str_len, +STRINGLIB(count)(const STRINGLIB_CHAR* str, Py_ssize_t str_len, const STRINGLIB_CHAR* sub, Py_ssize_t sub_len, Py_ssize_t maxcount) { @@ -19,7 +16,7 @@ stringlib_count(const STRINGLIB_CHAR* str, Py_ssize_t str_len, if (sub_len == 0) return (str_len < maxcount) ? str_len + 1 : maxcount; - count = fastsearch(str, str_len, sub, sub_len, maxcount, FAST_COUNT); + count = FASTSEARCH(str, str_len, sub, sub_len, maxcount, FAST_COUNT); if (count < 0) return 0; /* no match */ @@ -27,4 +24,4 @@ stringlib_count(const STRINGLIB_CHAR* str, Py_ssize_t str_len, return count; } -#endif + |