projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
c-xvasprintf: Fix "implicit declaration of function" GCC warning.
[gnulib.git]
/
lib
/
mbchar.h
diff --git
a/lib/mbchar.h
b/lib/mbchar.h
index
012bfcb
..
001f743
100644
(file)
--- a/
lib/mbchar.h
+++ b/
lib/mbchar.h
@@
-1,5
+1,5
@@
/* Multibyte character data type.
/* Multibyte character data type.
- Copyright (C) 2001, 2005-2007, 2009-201
0
Free Software Foundation, Inc.
+ Copyright (C) 2001, 2005-2007, 2009-201
2
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
@@
-156,6
+156,11
@@
#include <wchar.h>
#include <wctype.h>
#include <wchar.h>
#include <wctype.h>
+_GL_INLINE_HEADER_BEGIN
+#ifndef MBCHAR_INLINE
+# define MBCHAR_INLINE _GL_INLINE
+#endif
+
#define MBCHAR_BUF_SIZE 24
struct mbchar
#define MBCHAR_BUF_SIZE 24
struct mbchar
@@
-235,7
+240,7
@@
typedef struct mbchar mbchar_t;
/* Unprintable characters appear as a small box of width 1. */
#define MB_UNPRINTABLE_WIDTH 1
/* Unprintable characters appear as a small box of width 1. */
#define MB_UNPRINTABLE_WIDTH 1
-
static inline
int
+
MBCHAR_INLINE
int
mb_width_aux (wint_t wc)
{
int w = wcwidth (wc);
mb_width_aux (wint_t wc)
{
int w = wcwidth (wc);
@@
-256,7
+261,7
@@
mb_width_aux (wint_t wc)
(mbc)->wc = (mbc)->buf[0] = (sc))
/* Copying a character. */
(mbc)->wc = (mbc)->buf[0] = (sc))
/* Copying a character. */
-
static inline
void
+
MBCHAR_INLINE
void
mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc)
{
if (old_mbc->ptr == &old_mbc->buf[0])
mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc)
{
if (old_mbc->ptr == &old_mbc->buf[0])
@@
-304,7
+309,7
@@
mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc)
extern const unsigned int is_basic_table[];
extern const unsigned int is_basic_table[];
-
static inline
bool
+
MBCHAR_INLINE
bool
is_basic (char c)
{
return (is_basic_table [(unsigned char) c >> 5] >> ((unsigned char) c & 31))
is_basic (char c)
{
return (is_basic_table [(unsigned char) c >> 5] >> ((unsigned char) c & 31))
@@
-313,7
+318,7
@@
is_basic (char c)
#else
#else
-
static inline
bool
+
MBCHAR_INLINE
bool
is_basic (char c)
{
switch (c)
is_basic (char c)
{
switch (c)
@@
-347,4
+352,6
@@
is_basic (char c)
#endif
#endif
+_GL_INLINE_HEADER_END
+
#endif /* _MBCHAR_H */
#endif /* _MBCHAR_H */