From 2d44e171101261b1bd3c29e46a0a7a03b919286e Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 5 Jan 2010 15:14:35 +0100
Subject: [PATCH] maint: remove useless inclusions of "alloca.h"

* lib/getloadavg.c: Remove useless inclusion of "alloca.h".
* lib/readtokens.c: Likewise.
* lib/same.c: Likewise.
* modules/getloadavg (Depends-on): Remove xalloc.
* modules/readtokens: Likewise.
* modules/same: Likewise.
(cherry picked from commit 0e0f8f12ec241c0f1c1f21f960bb5cf908a0fa3c)
---
 ChangeLog          | 8 ++++++++
 lib/getloadavg.c   | 1 -
 lib/readtokens.c   | 2 --
 lib/same.c         | 1 -
 modules/getloadavg | 9 ++++-----
 modules/readtokens | 1 -
 modules/same       | 1 -
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13137084f..ca16e484c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-01-05  Jim Meyering  <meyering@redhat.com>
 
+	maint: remove useless inclusions of "alloca.h"
+	* lib/getloadavg.c: Remove useless inclusion of "alloca.h".
+	* lib/readtokens.c: Likewise.
+	* lib/same.c: Likewise.
+	* modules/getloadavg (Depends-on): Remove alloca.
+	* modules/readtokens: Likewise.
+	* modules/same: Likewise.
+
 	maint.mk: include 4 more function names in alloca.h-checking regexp
 	* top/maint.mk (sc_prohibit_xalloc_without_use): Use more complete
 	regexp.  Before, we would give a false-positive (saying alloca.h
diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index 4a9ca7f79..c6d782b4e 100644
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -111,7 +111,6 @@
 # include "c-strtod.h"
 # include "cloexec.h"
 # include "intprops.h"
-# include "xalloc.h"
 
 /* The existing Emacs configuration files define a macro called
    LOAD_AVE_CVT, which accepts a value of type LOAD_AVE_TYPE, and
diff --git a/lib/readtokens.c b/lib/readtokens.c
index e29f20e69..8172eb1f1 100644
--- a/lib/readtokens.c
+++ b/lib/readtokens.c
@@ -31,8 +31,6 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "xalloc.h"
-
 #if USE_UNLOCKED_IO
 # include "unlocked-io.h"
 #endif
diff --git a/lib/same.c b/lib/same.c
index 639d6c52a..1abc55c88 100644
--- a/lib/same.c
+++ b/lib/same.c
@@ -39,7 +39,6 @@
 #include "dirname.h"
 #include "error.h"
 #include "same-inode.h"
-#include "xalloc.h"
 
 #ifndef MIN
 # define MIN(a, b) ((a) < (b) ? (a) : (b))
diff --git a/modules/getloadavg b/modules/getloadavg
index 2fbeb4084..7865b8f04 100644
--- a/modules/getloadavg
+++ b/modules/getloadavg
@@ -6,14 +6,13 @@ lib/getloadavg.c
 m4/getloadavg.m4
 
 Depends-on:
-stdlib
-extensions
-cloexec
-xalloc
 c-strtod
+cloexec
+extensions
+fcntl-safer
 intprops
 stdbool
-fcntl-safer
+stdlib
 
 configure.ac:
 gl_GETLOADAVG([$gl_source_base])
diff --git a/modules/readtokens b/modules/readtokens
index 9453de997..d593b8fbf 100644
--- a/modules/readtokens
+++ b/modules/readtokens
@@ -7,7 +7,6 @@ lib/readtokens.c
 m4/readtokens.m4
 
 Depends-on:
-xalloc
 stdbool
 
 configure.ac:
diff --git a/modules/same b/modules/same
index a6fc64f9e..7a9252a58 100644
--- a/modules/same
+++ b/modules/same
@@ -8,7 +8,6 @@ lib/same.c
 m4/same.m4
 
 Depends-on:
-xalloc
 error
 dirname
 same-inode
-- 
2.11.0