X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftempname.c;h=e213600e3f2b33ea851e1d2bc418cb9646ce1bf4;hb=5d0b385594bc914e6233988bfb6bc1b92a2184b5;hp=fd31acc4448255a4298a4a98552c5c7df51419e8;hpb=a8753bfd5b8e2d2d440febce6355fc719eb469b4;p=gnulib.git

diff --git a/lib/tempname.c b/lib/tempname.c
index fd31acc44..e213600e3 100644
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -1,7 +1,8 @@
 /* tempname.c - generate the name of a temporary file.
 
    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+   2000, 2001, 2002, 2003, 2005, 2006, 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
@@ -51,11 +52,7 @@
 #include <string.h>
 
 #include <fcntl.h>
-
-#if HAVE_SYS_TIME_H || _LIBC
-# include <sys/time.h>
-#endif
-
+#include <sys/time.h>
 #include <stdint.h>
 #include <unistd.h>
 
@@ -200,7 +197,6 @@ static const char letters[] =
    __GT_DIR:		create a directory, which will be mode 0700.
 
    We use a clever algorithm to get hard-to-predict names. */
-#if _LIBC || !HAVE___GEN_TEMPNAME
 int
 __gen_tempname (char *tmpl, int kind)
 {
@@ -243,15 +239,11 @@ __gen_tempname (char *tmpl, int kind)
 #ifdef RANDOM_BITS
   RANDOM_BITS (random_time_bits);
 #else
-# if HAVE_GETTIMEOFDAY || _LIBC
   {
     struct timeval tv;
     __gettimeofday (&tv, NULL);
     random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;
   }
-# else
-  random_time_bits = time (NULL);
-# endif
 #endif
   value += random_time_bits ^ __getpid ();
 
@@ -321,15 +313,3 @@ __gen_tempname (char *tmpl, int kind)
   __set_errno (EEXIST);
   return -1;
 }
-
-#else /* !_LIBC && HAVE___GEN_TEMPNAME */
-
-# undef __gen_tempname
-extern int __gen_tempname (char *, int);
-int
-gen_tempname (char *tmpl, int kind)
-{
-  return __gen_tempname (tmpl, kind);
-}
-
-#endif /* !_LIBC && HAVE___GEN_TEMPNAME */