projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
md5, sha1, sha256, sha512: add gl_SET_CRYPTO_CHECK_DEFAULT
[gnulib.git]
/
lib
/
mbfile.h
diff --git
a/lib/mbfile.h
b/lib/mbfile.h
index
0a9a4b0
..
704c0cc
100644
(file)
--- a/
lib/mbfile.h
+++ b/
lib/mbfile.h
@@
-1,5
+1,5
@@
/* Multibyte character I/O: macros for multi-byte encodings.
/* Multibyte character I/O: macros for multi-byte encodings.
- Copyright (C) 2001, 2005, 2009
, 2010
Free Software Foundation, Inc.
+ Copyright (C) 2001, 2005, 2009
-2013
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-62,6
+62,14
@@
#include "mbchar.h"
#include "mbchar.h"
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef MBFILE_INLINE
+# define MBFILE_INLINE _GL_INLINE
+#endif
+
struct mbfile_multi {
FILE *fp;
bool eof_seen;
struct mbfile_multi {
FILE *fp;
bool eof_seen;
@@
-72,7
+80,7
@@
struct mbfile_multi {
struct mbchar pushback;
};
struct mbchar pushback;
};
-
static inline
void
+
MBFILE_INLINE
void
mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi *mbf)
{
size_t bytes;
mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi *mbf)
{
size_t bytes;
@@
-215,7
+223,7
@@
eof:
return;
}
return;
}
-
static inline
void
+
MBFILE_INLINE
void
mbfile_multi_ungetc (const struct mbchar *mbc, struct mbfile_multi *mbf)
{
mb_copy (&mbf->pushback, mbc);
mbfile_multi_ungetc (const struct mbchar *mbc, struct mbfile_multi *mbf)
{
mb_copy (&mbf->pushback, mbc);
@@
-239,4
+247,9
@@
typedef mbchar_t mbf_char_t;
#define mb_iseof(mbc) ((mbc).bytes == 0)
#define mb_iseof(mbc) ((mbc).bytes == 0)
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+
#endif /* _MBFILE_H */
#endif /* _MBFILE_H */