diff options
| author | Stephen Kitt <skitt@debian.org> | 2016-05-27 10:11:04 +0200 |
|---|---|---|
| committer | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-27 14:28:33 +0100 |
| commit | 752fd7247bc223bcea35bd89cf56d1c08ead9ba6 (patch) | |
| tree | b4a428f847a963738faaf24c8eff070fdb03a3a5 /lib/mbiter.h | |
| parent | 9f7d4fa477ff2a51d7c932b13d57ac22dc033105 (diff) | |
| parent | a9a31b1de5776a3b08a82101a4fa711294f0dd1d (diff) | |
Imported Debian patch 0.9.6+really0.9.3-0.1debian/0.9.6+really0.9.3-0.1
Diffstat (limited to 'lib/mbiter.h')
| -rw-r--r-- | lib/mbiter.h | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/lib/mbiter.h b/lib/mbiter.h index f3a8ecb2..8f443b59 100644 --- a/lib/mbiter.h +++ b/lib/mbiter.h @@ -1,5 +1,5 @@ /* Iterating through multibyte strings: macros for multi-byte encodings. - Copyright (C) 2001, 2005, 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007, 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -47,9 +47,9 @@ initializes the iterator, starting at startptr and crossing length bytes. mbi_avail (iter) - returns true if there are more multibyte characters available before + returns true if there are more multibyte chracters available before the end of string is reached. In this case, mbi_cur (iter) is - initialized to the next multibyte character. + initialized to the next multibyte chracter. mbi_advance (iter) advances the iterator by one multibyte character. @@ -97,14 +97,6 @@ #include "mbchar.h" -#ifndef _GL_INLINE_HEADER_BEGIN - #error "Please include config.h first." -#endif -_GL_INLINE_HEADER_BEGIN -#ifndef MBITER_INLINE -# define MBITER_INLINE _GL_INLINE -#endif - struct mbiter_multi { const char *limit; /* pointer to end of string */ @@ -120,7 +112,7 @@ struct mbiter_multi */ }; -MBITER_INLINE void +static inline void mbiter_multi_next (struct mbiter_multi *iter) { if (iter->next_done) @@ -180,14 +172,14 @@ mbiter_multi_next (struct mbiter_multi *iter) iter->next_done = true; } -MBITER_INLINE void +static inline void mbiter_multi_reloc (struct mbiter_multi *iter, ptrdiff_t ptrdiff) { iter->cur.ptr += ptrdiff; iter->limit += ptrdiff; } -MBITER_INLINE void +static inline void mbiter_multi_copy (struct mbiter_multi *new_iter, const struct mbiter_multi *old_iter) { new_iter->limit = old_iter->limit; @@ -220,6 +212,4 @@ typedef struct mbiter_multi mbi_iterator_t; /* Copying an iterator. */ #define mbi_copy mbiter_multi_copy -_GL_INLINE_HEADER_END - #endif /* _MBITER_H */ |