aboutsummaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-02-05 04:52:11 +0000
committerWayne Davison <wayned@samba.org>2006-02-05 04:52:11 +0000
commit595251de24388fdfbac120daf9f3a748745ef7c5 (patch)
treea969c5cb8172d1556375bc8454ac53275a932cfb /main.c
parentc85631421deb9eb49abff012f7bbd0dc96278b1b (diff)
downloadandroid_external_rsync-595251de24388fdfbac120daf9f3a748745ef7c5.tar.gz
android_external_rsync-595251de24388fdfbac120daf9f3a748745ef7c5.tar.bz2
android_external_rsync-595251de24388fdfbac120daf9f3a748745ef7c5.zip
Make sure that we don't try to use iconv() without iconv.h.
Diffstat (limited to 'main.c')
-rw-r--r--main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.c b/main.c
index 0ba67f84..e8b5efd3 100644
--- a/main.c
+++ b/main.c
@@ -792,7 +792,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out, f_in);
-#ifdef HAVE_ICONV_OPEN
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
setup_iconv();
#endif
@@ -831,7 +831,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
io_set_sock_fds(f_in, f_out);
setup_protocol(f_out,f_in);
-#ifdef HAVE_ICONV_OPEN
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
setup_iconv();
#endif