X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c8fa85b23bfebc68f0ab2e0464937f5ee4a8bf69..591c224584c04e0d6f58ece969946bd5472f7c89:/exclude.c

diff --git a/exclude.c b/exclude.c
index 0aa37693..16b2a562 100644
--- a/exclude.c
+++ b/exclude.c
@@ -913,7 +913,7 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
 			    invalid:
 				rprintf(FERROR,
 					"invalid modifier '%c' at position %d in filter rule: %s\n",
-					*s, s - (const uchar *)*rulestr_ptr, *rulestr_ptr);
+					*s, (int)(s - (const uchar *)*rulestr_ptr), *rulestr_ptr);
 				exit_cleanup(RERR_SYNTAX);
 			case '-':
 				if (!BITS_SETnUNSET(rule->rflags, FILTRULE_MERGE_FILE, FILTRULE_NO_PREFIXES))
@@ -1036,7 +1036,7 @@ static char default_cvsignore[] =
 	" *.a *.olb *.o *.obj *.so *.exe"
 	" *.Z *.elc *.ln core"
 	/* The rest we added to suit ourself. */
-	" .svn/ .git/ .bzr/";
+	" .svn/ .git/ .hg/ .bzr/";
 
 static void get_cvs_excludes(uint32 rflags)
 {