From: Jim Meyering <jim@meyering.net>
Date: Sun, 18 Feb 2007 21:34:37 +0000 (+0100)
Subject: Rely on gnulib-generated stdlib.h, not exit.h.
X-Git-Tag: COREUTILS-6_8~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6819756293ae8a0090d63b085cd60b64904b431b;p=thirdparty%2Fcoreutils.git

Rely on gnulib-generated stdlib.h, not exit.h.
* src/system.h: Don't include exit.h, now that it's subsumed
by the gnulib-generated stdlib.h.
* lib/xfts.c: Include <stdlib.h> rather than exit.h, now that stdlib.h
---

diff --git a/ChangeLog b/ChangeLog
index a0854d789e..ecc50541e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-02-18  Jim Meyering  <jim@meyering.net>
 
+	* src/system.h: Don't include exit.h, now that it's subsumed
+	by the gnulib-generated stdlib.h.
+
 	* tests/rm/fail-eacces: Skip this test when running as root.
 	Reported by Matthew Woehlke.
 
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 793a227f98..09b54b6498 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-18  Jim Meyering  <jim@meyering.net>
+
+	* xfts.c: Include <stdlib.h> rather than exit.h, now that stdlib.h
+	is guaranteed to provide a valid definition of EXIT_FAILURE.
+
 2007-01-19  Jim Meyering  <jim@meyering.net>
 
 	* .cvsignore, .gitignore: Add sys, as well as more
diff --git a/lib/xfts.c b/lib/xfts.c
index f06fa7b1b8..1402e95e30 100644
--- a/lib/xfts.c
+++ b/lib/xfts.c
@@ -1,6 +1,6 @@
 /* xfts.c -- a wrapper for fts_open
 
-   Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
 #include <config.h>
 
 #include <stdbool.h>
+#include <stdlib.h>
 
-#include "exit.h"
 #include "error.h"
 
 #include "gettext.h"
diff --git a/src/system.h b/src/system.h
index 383388bab4..763909bac0 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,5 +1,5 @@
 /* system-dependent definitions for coreutils
-   Copyright (C) 1989, 1991-2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1991-2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -113,7 +113,6 @@ you must include <sys/types.h> before including this file
 
 #include <stdbool.h>
 #include <stdlib.h>
-#include <exit.h>
 
 /* Exit statuses for programs like 'env' that exec other programs.
    EXIT_FAILURE might not be 1, so use EXIT_FAIL in such programs.  */