summaryrefslogtreecommitdiff
path: root/lib/mbchar.h
diff options
context:
space:
mode:
authorStephen Kitt <skitt@debian.org>2016-05-27 10:11:04 +0200
committerManuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>2016-05-27 14:28:33 +0100
commit752fd7247bc223bcea35bd89cf56d1c08ead9ba6 (patch)
treeb4a428f847a963738faaf24c8eff070fdb03a3a5 /lib/mbchar.h
parent9f7d4fa477ff2a51d7c932b13d57ac22dc033105 (diff)
parenta9a31b1de5776a3b08a82101a4fa711294f0dd1d (diff)
Imported Debian patch 0.9.6+really0.9.3-0.1debian/0.9.6+really0.9.3-0.1
Diffstat (limited to 'lib/mbchar.h')
-rw-r--r--lib/mbchar.h20
1 files changed, 5 insertions, 15 deletions
diff --git a/lib/mbchar.h b/lib/mbchar.h
index 9c70162d..f9f52b9c 100644
--- a/lib/mbchar.h
+++ b/lib/mbchar.h
@@ -1,5 +1,5 @@
/* Multibyte character data type.
- 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
@@ -156,14 +156,6 @@
#include <wchar.h>
#include <wctype.h>
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
-_GL_INLINE_HEADER_BEGIN
-#ifndef MBCHAR_INLINE
-# define MBCHAR_INLINE _GL_INLINE
-#endif
-
#define MBCHAR_BUF_SIZE 24
struct mbchar
@@ -243,7 +235,7 @@ typedef struct mbchar mbchar_t;
/* Unprintable characters appear as a small box of width 1. */
#define MB_UNPRINTABLE_WIDTH 1
-MBCHAR_INLINE int
+static inline int
mb_width_aux (wint_t wc)
{
int w = wcwidth (wc);
@@ -264,7 +256,7 @@ mb_width_aux (wint_t wc)
(mbc)->wc = (mbc)->buf[0] = (sc))
/* Copying a character. */
-MBCHAR_INLINE void
+static inline void
mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc)
{
if (old_mbc->ptr == &old_mbc->buf[0])
@@ -312,7 +304,7 @@ mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc)
extern const unsigned int is_basic_table[];
-MBCHAR_INLINE bool
+static inline bool
is_basic (char c)
{
return (is_basic_table [(unsigned char) c >> 5] >> ((unsigned char) c & 31))
@@ -321,7 +313,7 @@ is_basic (char c)
#else
-MBCHAR_INLINE bool
+static inline bool
is_basic (char c)
{
switch (c)
@@ -355,6 +347,4 @@ is_basic (char c)
#endif
-_GL_INLINE_HEADER_END
-
#endif /* _MBCHAR_H */