Merge minor changes from coreutils.

diff --git a/lib/dup-safer.c b/lib/dup-safer.c
index 034297aa1ef415be1e22d1933ca5bcf992824c13..1c46b6e7228a0a0a612ef2bfb04ecb4b4b13d6ff 100644 (file)
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -25,9 +25,7 @@
 
 #include <fcntl.h>
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #ifndef STDERR_FILENO
 # define STDERR_FILENO 2
 #endif

diff --git a/lib/fd-safer.c b/lib/fd-safer.c
index 93768600f742a3377782bca49db45723fb8ecd79..6b50451338a4181df094cf879662db2a8d2dba87 100644 (file)
--- a/lib/fd-safer.c
+++ b/lib/fd-safer.c
@@ -26,9 +26,7 @@
 
 #include <errno.h>
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #ifndef STDIN_FILENO
 # define STDIN_FILENO 0
 #endif

diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c
index 1eb594b32f248e12e2cab8083b029aa8be5e0036..ccaf1219f0446683eedbc2d1ccf1affc9db9c072 100644 (file)
--- a/lib/fopen-safer.c
+++ b/lib/fopen-safer.c
@@ -1,5 +1,5 @@
 /* Invoke fopen, but avoid some glitches.
-   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2005 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,19 +21,16 @@
 # include <config.h>
 #endif
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <unistd-safer.h>
+#include "stdio-safer.h"
+
+#include <errno.h>
+#include <unistd.h>
+#include "unistd-safer.h"
 
 #ifndef STDERR_FILENO
 # define STDERR_FILENO 2
 #endif
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdio-safer.h>
-
 /* Like fopen, but do not return stdin, stdout, or stderr.  */
 
 FILE *