Fixed failing hunks.

[rsync/rsync-patches.git] / atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 3e369ce..9bf36bd 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -65,7 +65,7 @@ After applying this patch, run these commands for a successful build:
                write_byte(f, 0);
 -              modtime = 0, mode = 0;
 +              modtime = 0, atime = 0, mode = 0;
-               dev = 0, rdev = makedev(0, 0);
+               dev = 0, rdev = MAKEDEV(0, 0);
                rdev_major = 0;
                uid = 0, gid = 0;
 @@ -323,7 +333,7 @@ static void send_file_entry(struct file_
@@ -113,7 +113,7 @@ After applying this patch, run these commands for a successful build:
        if (!flist) {
 -              modtime = 0, mode = 0;
 +              modtime = 0, atime = 0, mode = 0;
-               dev = 0, rdev = makedev(0, 0);
+               dev = 0, rdev = MAKEDEV(0, 0);
                rdev_major = 0;
                uid = 0, gid = 0;
 @@ -552,6 +571,8 @@ static struct file_struct *receive_file_
@@ -485,7 +485,7 @@ After applying this patch, run these commands for a successful build:
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0
-@@ -523,9 +525,12 @@ struct file_struct {
+@@ -529,9 +531,12 @@ struct file_struct {
        uid_t uid;
        gid_t gid;
        mode_t mode;