* lib/tempname.c (gen_tempname): Remove variant that invokes

__gen_tempname.
* m4/tempname.m4 (gl_FUNC_GEN_TEMPNAME): Don't test for
__gen_tempname.

diff --git a/ChangeLog b/ChangeLog
index 1942cb373fe8cb32e5385728fab1a97acfc6de6f..01a57c42820a870d2631601a30375910bc921b22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-09  Bruno Haible  <bruno@clisp.org>
+
+       * lib/tempname.c (gen_tempname): Remove variant that invokes
+       __gen_tempname.
+       * m4/tempname.m4 (gl_FUNC_GEN_TEMPNAME): Don't test for
+       __gen_tempname.
+
 2006-11-08  Bruno Haible  <bruno@clisp.org>
 
        * m4/longlong.m4 (AC_TYPE_LONG_LONG_INT): Set ac_cv_type_long_long_int

diff --git a/lib/tempname.c b/lib/tempname.c
index fd31acc4448255a4298a4a98552c5c7df51419e8..919badb3dc405c4921c10e9a6f87ce23cf15f372 100644 (file)
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -200,7 +200,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)
 {
@@ -321,15 +320,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 */

diff --git a/m4/tempname.m4 b/m4/tempname.m4
index cd0e442a4fe27e63056d3f8faefa2f827470d5e4..289200f854561619da8bea95f738294642d7c353 100644 (file)
--- a/m4/tempname.m4
+++ b/m4/tempname.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2
 
 # Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -10,7 +10,6 @@
 AC_DEFUN([gl_FUNC_GEN_TEMPNAME],
 [
   AC_REQUIRE([AC_SYS_LARGEFILE])
-  AC_CHECK_FUNCS_ONCE([__gen_tempname])
 
   AC_LIBOBJ([tempname])
   gl_PREREQ_TEMPNAME