aboutsummaryrefslogtreecommitdiffstats
path: root/util.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-05-25 11:53:53 +0200
committerJelmer Vernooij <jelmer@samba.org>2006-05-25 11:53:53 +0200
commit0a69d7bf97b76852c25b7f6634204c5fb5532487 (patch)
treee3616474ffe1560687136ffb458c9d2c4ce8e295 /util.c
parent1c8a7a232935d1c2b7f1916faae11d730624bdc3 (diff)
Use iconv from GLib if available
Diffstat (limited to 'util.c')
-rw-r--r--util.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/util.c b/util.c
index 43e1c19f..8f8ec7b3 100644
--- a/util.c
+++ b/util.c
@@ -38,7 +38,14 @@
#include <ctype.h>
#include <glib.h>
#include <time.h>
+#ifdef GLIB2
+#define iconv_t GIConv
+#define iconv_open g_iconv_open
+#define iconv_close g_iconv_close
+#define iconv g_iconv
+#else
#include <iconv.h>
+#endif
void strip_linefeed(gchar *text)
{