Fix merge conflict.

diff --git a/fileflags.diff b/fileflags.diff
index f591d88d43bf100b9b87b18273d6824e3120f3a2..6f71a61fc4c3fdd8ac178560956033749a0b7449 100644 (file)
--- a/fileflags.diff
+++ b/fileflags.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: bb16db1747e1119e3cbdbcee6d47ecd68def66cc
+based-on: 19d8550cf48fe8b5f21872892f33ae2203d80bf5
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
@@ -320,17 +320,17 @@ diff --git a/log.c b/log.c
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -28,6 +28,9 @@
- #include <locale.h>
+@@ -31,6 +31,9 @@
+ #ifdef __TANDEM
+ #include <floss.h(floss_execlp)>
  #endif
- #include <popt.h>
 +#ifdef SUPPORT_FORCE_CHANGE
 +#include <sys/sysctl.h>
 +#endif
  
  extern int dry_run;
  extern int list_only;
-@@ -54,6 +57,7 @@ extern int copy_unsafe_links;
+@@ -57,6 +60,7 @@ extern int copy_unsafe_links;
  extern int keep_dirlinks;
  extern int preserve_hard_links;
  extern int protocol_version;
@@ -338,7 +338,7 @@ diff --git a/main.c b/main.c
  extern int file_total;
  extern int recurse;
  extern int xfer_dirs;
-@@ -944,6 +948,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
+@@ -947,6 +951,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
         * points to an identical file won't be replaced by the referent. */
        copy_links = copy_dirlinks = copy_unsafe_links = 0;
  
@@ -704,7 +704,7 @@ diff --git a/rsync.h b/rsync.h
  #define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
  #define ITEM_XNAME_FOLLOWS (1<<12)
  #define ITEM_IS_NEW (1<<13)
-@@ -552,6 +554,31 @@ typedef unsigned int size_t;
+@@ -568,6 +570,31 @@ typedef unsigned int size_t;
  #endif
  #endif
  
@@ -736,7 +736,7 @@ diff --git a/rsync.h b/rsync.h
  /* Find a variable that is either exactly 32-bits or longer.
   * If some code depends on 32-bit truncation, it will need to
   * take special action in a "#if SIZEOF_INT32 > 4" section. */
-@@ -773,6 +800,7 @@ extern int pathname_ndx;
+@@ -789,6 +816,7 @@ extern int pathname_ndx;
  extern int depth_ndx;
  extern int uid_ndx;
  extern int gid_ndx;
@@ -744,7 +744,7 @@ diff --git a/rsync.h b/rsync.h
  extern int acls_ndx;
  extern int xattrs_ndx;
  
-@@ -827,6 +855,11 @@ extern int xattrs_ndx;
+@@ -843,6 +871,11 @@ extern int xattrs_ndx;
  /* When the associated option is on, all entries will have these present: */
  #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
  #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum