* mkstemp-safer.c: Include "mkstemp.h".

(mkstemp): Remove, since mkstemp.h does this for us.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 46f2ff0eaeeeaa53749f4106ba960423741b5fd1..416656ff4a048895f6e9308f09123d1deade0d24 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -6,6 +6,8 @@
        Include "mkstemp.h".
        Make the _LIBC code resemble glibc original more,
        e.g., use K&R style.
+       * mkstemp-safer.c: Include "mkstemp.h".
+       (mkstemp): Remove, since mkstemp.h does this for us.
        * stdlib--.h: Include mkstemp.h.
 
        Import this patch from libc:

diff --git a/lib/mkstemp-safer.c b/lib/mkstemp-safer.c
index 47d015a492356279a129af1e123533e51c40ff9a..d1587bad5abf761a29fec1bf187b154183d81f15 100644 (file)
--- a/lib/mkstemp-safer.c
+++ b/lib/mkstemp-safer.c
@@ -23,12 +23,9 @@
 #include "stdlib-safer.h"
 
 #include <stdlib.h>
+#include "mkstemp.h"
 #include "unistd-safer.h"
 
-#if ! HAVE_MKSTEMP
-int mkstemp (char *);
-#endif
-
 /* Like mkstemp, but do not return STDIN_FILENO, STDOUT_FILENO, or
    STDERR_FILENO.  */