diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-10-06 11:01:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:20:37 -0500 |
| commit | 2210d51e4e6f554d5c97e1a918db7353b2c74606 (patch) | |
| tree | 93a1a40c3640903a6ebc60a9cbda343e8ed2ad56 /source4 | |
| parent | 5efcccb2593038641af3416169f1bce497cad047 (diff) | |
| download | samba-2210d51e4e6f554d5c97e1a918db7353b2c74606.tar.gz samba-2210d51e4e6f554d5c97e1a918db7353b2c74606.tar.bz2 samba-2210d51e4e6f554d5c97e1a918db7353b2c74606.zip | |
r19122: merge from samba3:
sync system/iconv.h
metze
(This used to be commit 9c74964b619fd0754d3b72c21fe2cef4d24e7ad5)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/replace/system/iconv.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/source4/lib/replace/system/iconv.h b/source4/lib/replace/system/iconv.h index 75ee1d83ba..abc2d6f4e1 100644 --- a/source4/lib/replace/system/iconv.h +++ b/source4/lib/replace/system/iconv.h @@ -22,14 +22,27 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#if !defined(HAVE_ICONV) && defined(HAVE_ICONV_H) +#define HAVE_ICONV +#endif + +#if !defined(HAVE_GICONV) && defined(HAVE_GICONV_H) +#define HAVE_GICONV +#endif + +#if !defined(HAVE_BICONV) && defined(HAVE_BICONV_H) +#define HAVE_BICONV +#endif + #ifdef HAVE_NATIVE_ICONV -#ifdef HAVE_ICONV_H +#if defined(HAVE_ICONV) #include <iconv.h> -#endif -#ifdef HAVE_GICONV_H +#elif defined(HAVE_GICONV) #include <giconv.h> +#elif defined(HAVE_BICONV) +#include <biconv.h> #endif -#endif +#endif /* HAVE_NATIVE_ICONV */ /* needed for some systems without iconv. Doesn't really matter what error code we use */ |