projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
imaxdiv: Avoid link error on OSF/1 with DTK cc.
[gnulib.git]
/
lib
/
striconveha.c
diff --git
a/lib/striconveha.c
b/lib/striconveha.c
index
a43ed91
..
fb4c496
100644
(file)
--- a/
lib/striconveha.c
+++ b/
lib/striconveha.c
@@
-1,5
+1,5
@@
/* Character set conversion with error handling and autodetection.
/* Character set conversion with error handling and autodetection.
- Copyright (C) 2002, 2005, 2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005, 2007, 2009
-2011
Free Software Foundation, Inc.
Written by Bruno Haible.
This program is free software: you can redistribute it and/or modify
Written by Bruno Haible.
This program is free software: you can redistribute it and/or modify
@@
-226,7
+226,9
@@
mem_iconveha (const char *src, size_t srclen,
/* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
we want to use transliteration. */
/* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
we want to use transliteration. */
-#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105
+#if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
+ && !defined __UCLIBC__) \
+ || _LIBICONV_VERSION >= 0x0105
if (transliterate)
{
int retval;
if (transliterate)
{
int retval;
@@
-326,7
+328,9
@@
str_iconveha (const char *src,
/* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
we want to use transliteration. */
/* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
we want to use transliteration. */
-#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105
+#if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
+ && !defined __UCLIBC__) \
+ || _LIBICONV_VERSION >= 0x0105
if (transliterate)
{
char *result;
if (transliterate)
{
char *result;