X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7a28d18448acbe1620a57c3c6b3d7c513aa67f8b..d762dfe94b9b9122f58a12ac1f5a0dfacee5dcb1:/compat.c

diff --git a/compat.c b/compat.c
index 52bba804..e7693ee9 100644
--- a/compat.c
+++ b/compat.c
@@ -3,12 +3,11 @@
  *
  * Copyright (C) Andrew Tridgell 1996
  * Copyright (C) Paul Mackerras 1996
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2007 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,7 +23,7 @@
 
 int remote_protocol = 0;
 int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
-int incremental = 0;
+int inc_recurse = 0;
 
 extern int verbose;
 extern int am_server;
@@ -147,7 +146,7 @@ void setup_protocol(int f_out,int f_in)
 	} else if (protocol_version >= 30) {
 		if (recurse && !preserve_hard_links && !delete_before
 		 && !delete_after && !delay_updates && !prune_empty_dirs)
-			incremental = 1;
+			inc_recurse = 1;
 		need_messages_from_generator = 1;
 	}