X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/beef86d0dda124ca59005846049cf7d60efb69c7..698bc16e87b0ac6b29668fe0df4f3fd6d41e4b67:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 2d7c28ff..3619810b 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -391,7 +391,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 	pid_t pre_exec_pid = 0;
 	char *request = NULL;
 
-#ifdef ICONV_CONST
+#ifdef ICONV_OPTION
 	iconv_opt = lp_charset(i);
 	if (*iconv_opt)
 		setup_iconv();
@@ -806,6 +806,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 		exit_cleanup(RERR_UNSUPPORTED);
 	}
 
+#ifdef ICONV_OPTION
 	if (!iconv_opt) {
 		if (ic_send != (iconv_t)-1) {
 			iconv_close(ic_send);
@@ -816,6 +817,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 			ic_recv = (iconv_t)-1;
 		}
 	}
+#endif
 
 	if (!numeric_ids
 	 && (use_chroot ? lp_numeric_ids(i) != False : lp_numeric_ids(i) == True))