diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:32 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:32 +0100 |
| commit | 00893e79fc62966067af1a106567db96bd170338 (patch) | |
| tree | 52b35cd0b42ca28e62a2ffbecade2e13dd8332cf /lib/uniconv/u16-conv-from-enc.c | |
| parent | 26112352a774737e1ce5580c93654a26c1e82b39 (diff) | |
New upstream version 1.2upstream/1.2
Diffstat (limited to 'lib/uniconv/u16-conv-from-enc.c')
| -rw-r--r-- | lib/uniconv/u16-conv-from-enc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/uniconv/u16-conv-from-enc.c b/lib/uniconv/u16-conv-from-enc.c index ef60f358..272cba3f 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-2022 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2024 Free Software Foundation, Inc. This file is free software. It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". @@ -36,7 +36,8 @@ #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)) && !defined __UCLIBC__) +#if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \ + || (((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) && !defined __UCLIBC__) # ifdef WORDS_BIGENDIAN # define UTF16_NAME "UTF-16BE" # else |