[libexif-cvs] exif/exif exif-i18n.c,1.2,1.3

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11735/exif

Modified Files:
	exif-i18n.c 
Log Message:

2004-08-27  Lutz Mueller <lu...@us...>

	* exif/exif-i18n.c: Some users don't have iconv.


Index: exif-i18n.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/exif-i18n.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-i18n.c	30 Sep 2003 22:53:37 -0000	1.2
+++ exif-i18n.c	27 Aug 2004 16:28:18 -0000	1.3
@@ -1,7 +1,10 @@
 #include <config.h>
 #include "exif-i18n.h"
 
-#include <iconv.h>
+#ifdef HAVE_ICONV
+#  include <iconv.h>
+#endif
+
 #include <string.h>
 #include <sys/types.h>
 
@@ -11,6 +14,7 @@
 const char *
 exif_i18n_convert_utf8_to_lat1 (const char *in)
 {
+#ifdef HAVE_ICONV
 	static iconv_t tr = 0;
 	size_t t = (in ? strlen (in) : 0);
 	static char buf[2048];
@@ -23,4 +27,7 @@
 	if (!tr) tr = iconv_open ("ISO-8859-1", "UTF-8");
 	iconv (tr, (char **) &in, &t, (char **) &out, &buf_size);
 	return buf;
+#else
+	return in	
+#endif
 }