Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak the files to start work on the next release.
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
a1cdda2
..
8f5c1f3
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-3,7
+3,7
@@
*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2000, 2001, 2002 Martin Pool <mbp@samba.org>
*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2000, 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002-200
7
Wayne Davison
+ * Copyright (C) 2002-200
8
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-1140,7
+1140,9
@@
int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
break;
case OPT_NO_ICONV:
break;
case OPT_NO_ICONV:
+#ifdef ICONV_OPTION
iconv_opt = NULL;
iconv_opt = NULL;
+#endif
break;
case OPT_MAX_SIZE:
break;
case OPT_MAX_SIZE: