svn commit: samba r19122 - in branches/SAMBA_4_0/source/lib/replace/system: .

[metze at samba.org]

Author: metze
Date: 2006-10-06 11:01:05 +0000 (Fri, 06 Oct 2006)
New Revision: 19122

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19122

Log:
merge from samba3:

sync system/iconv.h

metze
Modified:
   branches/SAMBA_4_0/source/lib/replace/system/iconv.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/system/iconv.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/system/iconv.h	2006-10-06 10:58:39 UTC (rev 19121)
+++ branches/SAMBA_4_0/source/lib/replace/system/iconv.h	2006-10-06 11:01:05 UTC (rev 19122)
@@ -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 */