Changed "statx" to "stat_x" to try to work around a build problem on AIX.

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index eaa7c55..80c44a3 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -48,10 +48,7 @@ extern int preserve_acls;
 extern int preserve_xattrs;
 extern int need_messages_from_generator;
 extern int delete_mode, delete_before, delete_during, delete_after;
-extern int delete_excluded;
-extern int make_backups;
 extern char *shell_cmd; /* contains VER.SUB string if client is a pre-release */
-extern char *backup_dir, *backup_suffix;
 extern char *partial_dir;
 extern char *dest_option;
 extern char *files_from;
@@ -108,7 +105,7 @@ static void check_sub_protocol(void)
 void setup_protocol(int f_out,int f_in)
 {
        if (am_sender)
-               file_extra_cnt += PTR_EXTRA_LEN;
+               file_extra_cnt += PTR_EXTRA_CNT;
        else
                file_extra_cnt++;
        if (preserve_uid)
@@ -119,10 +116,6 @@ void setup_protocol(int f_out,int f_in)
                acls_ndx = ++file_extra_cnt;
        if (preserve_xattrs)
                xattrs_ndx = ++file_extra_cnt;
-#ifdef ICONV_OPTION
-       if (iconv_opt && (!am_sender || inc_recurse))
-               ic_ndx = ++file_extra_cnt;
-#endif
 
        if (remote_protocol == 0) {
                if (am_server && !local_server)
@@ -230,6 +223,11 @@ void setup_protocol(int f_out,int f_in)
                need_messages_from_generator = 1;
        }
 
+#ifdef ICONV_OPTION
+       if (iconv_opt && (!am_sender || inc_recurse))
+               ic_ndx = ++file_extra_cnt;
+#endif
+
        if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
                int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY;
                if (!am_sender || protocol_version >= 30)