* sysdeps/generic/tmpfile.c [USE_IN_LIBIO] (tmpfile): Don't #define

	if already defined.
	[USE_IN_LIBIO]: Conditionalize versioned_symbol use on
	[GEN_THIS == __GT_FILE] so that tmpfile64.c's inclusion doesn't get it.

diff --git a/ChangeLog b/ChangeLog
index f117209..3974fc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-12  Roland McGrath  <roland@frob.com>
+
+       * sysdeps/generic/tmpfile.c [USE_IN_LIBIO] (tmpfile): Don't #define
+       if already defined.
+       [USE_IN_LIBIO]: Conditionalize versioned_symbol use on
+       [GEN_THIS == __GT_FILE] so that tmpfile64.c's inclusion doesn't get it.
+
 2002-06-11  Roland McGrath  <roland@frob.com>
 
        * sysdeps/mach/hurd/xstat64.c: Conditionalize entire contents of the

diff --git a/sysdeps/generic/tmpfile.c b/sysdeps/generic/tmpfile.c
index 051cb79..847a744 100644 (file)
--- a/sysdeps/generic/tmpfile.c
+++ b/sysdeps/generic/tmpfile.c
@@ -23,7 +23,9 @@
 #ifdef USE_IN_LIBIO
 # include <iolibio.h>
 # define __fdopen INTUSE(_IO_fdopen)
-# define tmpfile __new_tmpfile
+# ifndef tmpfile
+#  define tmpfile __new_tmpfile
+# endif
 #endif
 
 #ifndef GEN_THIS
@@ -57,7 +59,7 @@ tmpfile (void)
   return f;
 }
 
-#ifdef USE_IN_LIBIO
+#if defined USE_IN_LIBIO && GEN_THIS == __GT_FILE /* Not for tmpfile64.  */
 # undef tmpfile
 # include <shlib-compat.h>
 versioned_symbol (libc, __new_tmpfile, tmpfile, GLIBC_2_1);