From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 3 Jul 2005 07:14:28 +0000 (+0000)
Subject: Include fcntl--.h rather than fcntl.h.
X-Git-Tag: CPPI-1_12~392
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd1806f708eeb6da8682e1612f5e21fa3a664be5;p=thirdparty%2Fcoreutils.git

Include fcntl--.h rather than fcntl.h.
Do not include unistd-safer.h.
(getloadavg): Don't call fd_safer; no longer needed
now that we include fcntl--.h.
---

diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index 9a4988e8b0..bf57e10403 100644
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -445,9 +445,7 @@
 #  include <sys/dg_sys_info.h>
 # endif
 
-# include <fcntl.h>
-
-# include "unistd-safer.h"
+# include "fcntl--.h"
 
 /* Avoid static vars inside a function since in HPUX they dump as pure.  */
 
@@ -907,7 +905,7 @@ getloadavg (double loadavg[], int nelem)
   if (!getloadavg_initialized)
     {
 #  ifndef SUNOS_5
-      channel = fd_safer (open ("/dev/kmem", O_RDONLY));
+      channel = open ("/dev/kmem", O_RDONLY);
       if (channel >= 0)
 	{
 	  /* Set the channel to close on exec, so it does not