diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-06-11 13:13:21 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-06-11 13:13:21 +0000 |
| commit | 500500ec9b7b0d0cef90b48c9b4ddc8866b5f19c (patch) | |
| tree | 1d7b3e6fab5c199fdbbaab53ee9532de6a4c8cf7 /gettext-tools/gnulib-lib/wchar.in.h | |
| parent | 6eb5949dd99d174393465069c2fd0bab32deddcc (diff) | |
| download | gettext-tarball-master.tar.gz | |
gettext-0.19.8.1HEADgettext-0.19.8.1master
Diffstat (limited to 'gettext-tools/gnulib-lib/wchar.in.h')
| -rw-r--r-- | gettext-tools/gnulib-lib/wchar.in.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gettext-tools/gnulib-lib/wchar.in.h b/gettext-tools/gnulib-lib/wchar.in.h index 684299f..755600f 100644 --- a/gettext-tools/gnulib-lib/wchar.in.h +++ b/gettext-tools/gnulib-lib/wchar.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues. - Copyright (C) 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2007-2016 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 @@ -31,7 +31,7 @@ @PRAGMA_COLUMNS@ #if (((defined __need_mbstate_t || defined __need_wint_t) \ - && !defined __MINGW32__) \ + && !defined __MINGW32__ && !defined __KLIBC__) \ || (defined __hpux \ && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ @@ -445,6 +445,11 @@ _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t)); # if !@HAVE_DECL_WCWIDTH@ /* wcwidth exists but is not declared. */ _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE); +# elif defined __KLIBC__ +/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a + static inline function. The implementation of wcwidth in wcwidth.c + causes a "conflicting types" error. */ +# undef wcwidth # endif _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); # endif |