diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-05-28 10:03:28 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-05-28 19:58:56 +0200 |
| commit | 86076c9b17b9a32b348cafb8b724f57f7da64d58 (patch) | |
| tree | 051e32d0b80d10d4c8aff8590288211bbe71202c /gl/wchar.in.h | |
| parent | 34d1dd66808cf393dbe6a3a60ef659182b2b6d0f (diff) | |
| download | gnutls-86076c9b17b9a32b348cafb8b724f57f7da64d58.tar.gz | |
Rely on gnulib's secure_getenv()
Diffstat (limited to 'gl/wchar.in.h')
| -rw-r--r-- | gl/wchar.in.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gl/wchar.in.h b/gl/wchar.in.h index ae31e8d804..cf27441065 100644 --- a/gl/wchar.in.h +++ b/gl/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 Lesser 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 |