From 1b80624c57cdd71a2f421ebe399416580d8d87b9 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 6 Oct 2006 10:58:39 +0000
Subject: r19121: try to get rid of the difference between in system/iconv.h
 between samba 3 and 4.

metze
(This used to be commit 04031a9fca037ad77cca0ba0da6801d5017521ba)
---
 source3/lib/replace/system/iconv.h | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/source3/lib/replace/system/iconv.h b/source3/lib/replace/system/iconv.h
index fcd3199680..abc2d6f4e1 100644
--- a/source3/lib/replace/system/iconv.h
+++ b/source3/lib/replace/system/iconv.h
@@ -22,17 +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
+#if defined(HAVE_ICONV)
 #include <iconv.h>
-#endif
-#ifdef HAVE_GICONV
+#elif defined(HAVE_GICONV)
 #include <giconv.h>
-#endif
-#ifdef HAVE_BICONV
+#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 */
-- 
cgit