[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS gsasl/gl
From: |
gsasl-commit |
Subject: |
CVS gsasl/gl |
Date: |
Fri, 10 Dec 2004 22:44:12 +0100 |
Update of /home/cvs/gsasl/gl
In directory dopio:/tmp/cvs-serv11774/gl
Modified Files:
Makefile.am iconvme.c
Log Message:
Update.
--- /home/cvs/gsasl/gl/Makefile.am 2004/12/10 20:48:10 1.38
+++ /home/cvs/gsasl/gl/Makefile.am 2004/12/10 21:44:12 1.39
@@ -80,6 +80,7 @@
## begin gnulib module iconvme
libgl_la_SOURCES += iconvme.h iconvme.c
+lib_LIBADD += $(LTLIBICONV)
## end gnulib module iconvme
--- /home/cvs/gsasl/gl/iconvme.c 2004/12/10 20:48:10 1.1
+++ /home/cvs/gsasl/gl/iconvme.c 2004/12/10 21:44:12 1.2
@@ -31,15 +31,18 @@
/* Get errno. */
#include <errno.h>
+#if HAVE_ICONV
/* Get iconv etc. */
-#include <iconv.h>
+# include <iconv.h>
+#endif
char *
iconv_z (const char *to_codeset, const char *from_codeset, const char *str)
{
+ char *dest = NULL;
+#if HAVE_ICONV
iconv_t cd;
- char *dest;
char *outp;
ICONV_CONST char *p;
size_t inbytes_remaining;
@@ -47,6 +50,7 @@
size_t err;
size_t outbuf_size;
int have_error = 0;
+#endif
if (strcmp (to_codeset, from_codeset) == 0)
{
@@ -59,6 +63,7 @@
return strcpy (q, str);
}
+#if HAVE_ICONV
cd = iconv_open (to_codeset, from_codeset);
if (cd == (iconv_t) - 1)
@@ -132,6 +137,7 @@
free (dest);
dest = NULL;
}
+#endif
return dest;
}
- CVS gsasl/gl, gsasl-commit, 2004/12/10
- CVS gsasl/gl,
gsasl-commit <=
- CVS gsasl/gl, gsasl-commit, 2004/12/10
- CVS gsasl/gl, gsasl-commit, 2004/12/12
- CVS gsasl/gl, gsasl-commit, 2004/12/14
- CVS gsasl/gl, gsasl-commit, 2004/12/14
- CVS gsasl/gl, gsasl-commit, 2004/12/14
- CVS gsasl/gl, gsasl-commit, 2004/12/14
- CVS gsasl/gl, gsasl-commit, 2004/12/15
- CVS gsasl/gl, gsasl-commit, 2004/12/19