summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2006-09-05 11:12:06 +0000
committerJim Meyering <jim@meyering.net>2006-09-05 11:12:06 +0000
commitfe99a4f8c8017b3940ccb9206600788e6d86107f (patch)
treea38d86eb0cccd4e14418e82d7ff49be1d9341f02
parent2809bfb8f73b8ad2576e82177d98ae20744cfc37 (diff)
downloadcoreutils-fe99a4f8c8017b3940ccb9206600788e6d86107f.tar.xz
* src/c99-to-c89.diff (remove.c): Adapt one hunk to match the new
context from change of 2006-09-02.
-rw-r--r--ChangeLog5
-rw-r--r--src/c99-to-c89.diff2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c5ba74617..086a49699 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-05 Jim Meyering <jim@meyering.net>
+
+ * src/c99-to-c89.diff (remove.c): Adapt one hunk to match the new
+ context from change of 2006-09-02.
+
2006-09-04 Jim Meyering <jim@meyering.net>
* README-cvs: Fix typo in update command.
diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff
index 214e5eba6..b43506355 100644
--- a/src/c99-to-c89.diff
+++ b/src/c99-to-c89.diff
@@ -81,7 +81,7 @@ diff -u -p -r1.156 remove.c
+ {
int fd_cwd = AT_FDCWD;
- enum RM_status status = remove_entry (fd_cwd, ds, filename, x, NULL);
+ enum RM_status status = remove_entry (fd_cwd, ds, filename, &st, x, NULL);
if (status == RM_NONEMPTY_DIR)
@@ -1399,6 +1406,7 @@ rm_1 (Dirstack_state *ds, char const *fi
ds_clear (ds);