svn commit: samba r19121 - in branches/SAMBA_3_0/source/lib/replace/system: .

metze at samba.org metze at samba.org
Fri Oct 6 10:58:39 GMT 2006


Author: metze
Date: 2006-10-06 10:58:39 +0000 (Fri, 06 Oct 2006)
New Revision: 19121

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

Log:
try to get rid of the difference between in system/iconv.h
between samba 3 and 4.

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


Changeset:
Modified: branches/SAMBA_3_0/source/lib/replace/system/iconv.h
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/system/iconv.h	2006-10-06 10:17:52 UTC (rev 19120)
+++ branches/SAMBA_3_0/source/lib/replace/system/iconv.h	2006-10-06 10:58:39 UTC (rev 19121)
@@ -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 */



More information about the samba-cvs mailing list