aboutsummaryrefslogtreecommitdiffstats
path: root/flist.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2007-09-18 18:46:03 +0000
committerWayne Davison <wayned@samba.org>2007-09-18 18:46:03 +0000
commit229554084d9b1ff4e9b3b7600224bf3af8178c3c (patch)
tree7d56f9b30d81a1333138dd92ad5855dad165f111 /flist.c
parent4a1edb63dd28c8b347d1a99551232dd8a13475e7 (diff)
downloadandroid_external_rsync-229554084d9b1ff4e9b3b7600224bf3af8178c3c.tar.gz
android_external_rsync-229554084d9b1ff4e9b3b7600224bf3af8178c3c.tar.bz2
android_external_rsync-229554084d9b1ff4e9b3b7600224bf3af8178c3c.zip
Added missing "#ifdef ICONV_OPTION" conditionals.
Diffstat (limited to 'flist.c')
-rw-r--r--flist.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/flist.c b/flist.c
index a5c7ca31..dfa81c4d 100644
--- a/flist.c
+++ b/flist.c
@@ -1645,8 +1645,10 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
int flags, disable_buffering;
int reading_remotely = filesfrom_host != NULL;
int rl_flags = (reading_remotely ? 0 : RL_DUMP_COMMENTS)
- | (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0)
- | (filesfrom_convert ? RL_CONVERT : 0);
+#ifdef ICONV_OPTION
+ | (filesfrom_convert ? RL_CONVERT : 0)
+#endif
+ | (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0);
rprintf(FLOG, "building file list\n");
if (show_filelist_p())