From 31a884dab7510d84a689ef8092132c93e3dcc4ad Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sun, 19 Oct 2008 13:35:16 +0200
Subject: accommodate gnulib header removals

* src/copy.c: Don't include "euidaccess.h" or "lchmod.h".
* src/cp.c: Don't include "lchmod.h".
* src/ls.c: Don't include "dirfd.h".
* src/mkdir.c: Don't include "lchmod.h".
* src/pwd.c: Don't include "dirfd.h".
* src/remove.c: Don't include "dirfd.h" or "euidaccess.h".
* src/test.c: Don't include "euidaccess.h".
* gl/modules/getloadavg.diff: Adjust diff for changed context.
* src/uptime.c (uptime): Remove declaration.
---
 src/copy.c   | 2 --
 src/cp.c     | 1 -
 src/ls.c     | 1 -
 src/mkdir.c  | 1 -
 src/pwd.c    | 1 -
 src/remove.c | 2 --
 src/test.c   | 1 -
 src/uptime.c | 2 --
 8 files changed, 11 deletions(-)

(limited to 'src')

diff --git a/src/copy.c b/src/copy.c
index 5a584752d..bc1b20ee2 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -35,7 +35,6 @@
 #include "buffer-lcm.h"
 #include "copy.h"
 #include "cp-hash.h"
-#include "euidaccess.h"
 #include "error.h"
 #include "fcntl--.h"
 #include "file-set.h"
@@ -45,7 +44,6 @@
 #include "hash.h"
 #include "hash-triple.h"
 #include "ignore-value.h"
-#include "lchmod.h"
 #include "quote.h"
 #include "same.h"
 #include "savedir.h"
diff --git a/src/cp.c b/src/cp.c
index 58c9c0953..95eba0cf1 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -30,7 +30,6 @@
 #include "error.h"
 #include "filenamecat.h"
 #include "ignore-value.h"
-#include "lchmod.h"
 #include "quote.h"
 #include "stat-time.h"
 #include "utimens.h"
diff --git a/src/ls.c b/src/ls.c
index efe42e3ec..f454d0e29 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -87,7 +87,6 @@
 #include "acl.h"
 #include "argmatch.h"
 #include "dev-ino.h"
-#include "dirfd.h"
 #include "error.h"
 #include "filenamecat.h"
 #include "hard-locale.h"
diff --git a/src/mkdir.c b/src/mkdir.c
index e408f2975..ca543aa6f 100644
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -24,7 +24,6 @@
 
 #include "system.h"
 #include "error.h"
-#include "lchmod.h"
 #include "mkdir-p.h"
 #include "modechange.h"
 #include "prog-fprintf.h"
diff --git a/src/pwd.c b/src/pwd.c
index 3c7b4fcc4..ac59155de 100644
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -20,7 +20,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "dirfd.h"
 #include "error.h"
 #include "long-options.h"
 #include "quote.h"
diff --git a/src/remove.c b/src/remove.c
index e92f78caf..28684b29c 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -24,9 +24,7 @@
 
 #include "system.h"
 #include "cycle-check.h"
-#include "dirfd.h"
 #include "error.h"
-#include "euidaccess.h"
 #include "euidaccess-stat.h"
 #include "file-type.h"
 #include "hash.h"
diff --git a/src/test.c b/src/test.c
index 1fe7da00c..14d20fd27 100644
--- a/src/test.c
+++ b/src/test.c
@@ -38,7 +38,6 @@
 #endif
 
 #include "system.h"
-#include "euidaccess.h"
 #include "quote.h"
 #include "stat-time.h"
 #include "strnumcmp.h"
diff --git a/src/uptime.c b/src/uptime.c
index 8687a575f..95fea4b91 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -46,8 +46,6 @@
   proper_name ("David MacKenzie"), \
   proper_name ("Kaveh Ghazi")
 
-int getloadavg ();
-
 static void
 print_uptime (size_t n, const STRUCT_UTMP *this)
 {
-- 
cgit v1.2.3-54-g00ecf