git.samba.org
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0099e42
)
Fixed a compilation problem when iconv support is disabled.
author
Wayne Davison
<wayned@samba.org>
Tue, 19 Feb 2008 00:48:20 +0000
(16:48 -0800)
committer
Wayne Davison
<wayned@samba.org>
Tue, 19 Feb 2008 00:48:20 +0000
(16:48 -0800)
clientserver.c
patch
|
blob
|
history
options.c
patch
|
blob
|
history
diff --git
a/clientserver.c
b/clientserver.c
index 2d7c28ff6c1980ec1c3874f4d8e4b2d1c8eb1019..3619810b7facd594cd477ceeb353b277811cad7f 100644
(file)
--- 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))
diff --git
a/options.c
b/options.c
index a1cdda20c743bf47406ed3acff8a3e802b6ca474..22aafaa0f59ac4872adeae1902978252da0a0a02 100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-1140,7
+1140,9
@@
int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
break;
case OPT_NO_ICONV:
+#ifdef ICONV_OPTION
iconv_opt = NULL;
+#endif
break;
case OPT_MAX_SIZE: