diff options
| author | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-26 16:48:15 +0100 |
|---|---|---|
| committer | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-26 16:48:15 +0100 |
| commit | 5f2b09982312c98863eb9a8dfe2c608b81f58259 (patch) | |
| tree | e5d38581c2f36e1cca02efedd2d85044d77f76f9 /lib/uniconv/u16-conv-from-enc.c | |
| parent | 3e0814cd9862b89c7a39672672937477bd87ddfb (diff) | |
Imported Upstream version 0.9.6upstream/0.9.6
Diffstat (limited to 'lib/uniconv/u16-conv-from-enc.c')
| -rw-r--r-- | lib/uniconv/u16-conv-from-enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/uniconv/u16-conv-from-enc.c b/lib/uniconv/u16-conv-from-enc.c index dc4c21d2..809b59b6 100644 --- a/lib/uniconv/u16-conv-from-enc.c +++ b/lib/uniconv/u16-conv-from-enc.c @@ -1,5 +1,5 @@ /* Conversion to UTF-16 from legacy encodings. - Copyright (C) 2002, 2006-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2015 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 @@ -28,7 +28,7 @@ #include "unistr.h" /* Name of UTF-16 encoding with machine dependent endianness and alignment. */ -#if defined _LIBICONV_VERSION || (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) +#if defined _LIBICONV_VERSION || (((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) && !defined __UCLIBC__) # ifdef WORDS_BIGENDIAN # define UTF16_NAME "UTF-16BE" # else |