X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1ed56a05c26b6cb6f3891ce16be89aeab388a293..6226396c4ac4980518d7a97203574501a4562090:/options.c

diff --git a/options.c b/options.c
index a1cdda20..e7af3a15 100644
--- 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) 2002-2007 Wayne Davison
+ * Copyright (C) 2002-2008 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
@@ -259,7 +259,7 @@ static void print_rsync_version(enum logcode f)
 
 	rprintf(f, "%s  version %s  protocol version %d%s\n",
 		RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-	rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n");
+	rprintf(f, "Copyright (C) 1996-2008 by Andrew Tridgell, Wayne Davison, and others.\n");
 	rprintf(f, "Web site: http://rsync.samba.org/\n");
 	rprintf(f, "Capabilities:\n");
 	rprintf(f, "    %d-bit files, %d-bit inums, %d-bit timestamps, %d-bit long ints,\n",
@@ -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: