diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-29 23:13:42 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-22 01:58:24 -0700 |
commit | 664a18513b61e82c49ed41b41edd752020b2cc42 (patch) | |
tree | 4b05fab2066fddec3997dbb07c1393a379db73e9 /lib/mbfile.h | |
parent | 6238e1ae8d96191ee8a580a60ff5287f22f6f04d (diff) | |
download | gnulib-664a18513b61e82c49ed41b41edd752020b2cc42.tar.gz |
binary-io, eealloc, mbfile, mbiter, mbutil, xsize: better 'inline'
* lib/binary-io.c, lib/eealloc.c, lib/mbfile.c, lib/mbiter.c:
* lib/mbuiter.c, lib/xsize.c: New files.
* lib/binary-io.h (BINARY_IO_INLINE):
* lib/eealloc.h (EEALLOC_INLINE):
* lib/mbfile.h (MBFILE_INLINE):
* lib/mbiter.h (MBITER_INLINE):
* lib/mbuiter.h (MBUITER_INLINE):
* lib/xsize.h (XSIZE_INLINE):
New macros.
Replace all uses of 'static inline' with them.
Use _GL_INLINE_HEADER_BEGIN, _GL_INLINE_HEADER_END.
* m4/eealloc.m4 (gl_EEALLOC):
* m4/mbfile.m4 (gl_MBFILE):
* m4/mbiter.m4 (gl_MBITER):
* m4/xsize.m4 (gl_XSIZE):
Do not require AC_C_INLINE.
* modules/binary-io (Files, lib_SOURCES): Add lib/binary-io.c
* modules/eealloc (Files, lib_SOURCES): Add lib/eealloc.c.
* modules/mbfile (Files, lib_SOURCES): Add lib/mbfile.c.
* modules/mbiter (Files, lib_SOURCES): Add lib/mbiter.c.
* modules/mbuiter (Files, lib_SOURCES): Add lib/mbuiter.c.
* modules/xsize (Files, lib_SOURCES): Add lib/xsize.c.
* modules/binary-io, modules/eealloc, modules/mbfile:
* modules/mbiter, modules/mbuiter:
(Depends-on): Add extern-inline.
Diffstat (limited to 'lib/mbfile.h')
-rw-r--r-- | lib/mbfile.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/mbfile.h b/lib/mbfile.h index 58e598bf16..065b85666e 100644 --- a/lib/mbfile.h +++ b/lib/mbfile.h @@ -62,6 +62,11 @@ #include "mbchar.h" +_GL_INLINE_HEADER_BEGIN +#ifndef MBFILE_INLINE +# define MBFILE_INLINE _GL_INLINE +#endif + struct mbfile_multi { FILE *fp; bool eof_seen; @@ -72,7 +77,7 @@ struct mbfile_multi { struct mbchar pushback; }; -static inline void +MBFILE_INLINE void mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi *mbf) { size_t bytes; @@ -215,7 +220,7 @@ eof: return; } -static inline void +MBFILE_INLINE void mbfile_multi_ungetc (const struct mbchar *mbc, struct mbfile_multi *mbf) { mb_copy (&mbf->pushback, mbc); @@ -239,4 +244,6 @@ typedef mbchar_t mbf_char_t; #define mb_iseof(mbc) ((mbc).bytes == 0) +_GL_INLINE_HEADER_BEGIN + #endif /* _MBFILE_H */ |