summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--lib/ChangeLog5
-rw-r--r--lib/xfts.c4
-rw-r--r--src/system.h3
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a0854d789..ecc50541e 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 793a227f9..09b54b649 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 f06fa7b1b..1402e95e3 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 383388bab..763909bac 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. */