aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-06-12 20:36:22 +0000
committerRoland McGrath <roland@gnu.org>2002-06-12 20:36:22 +0000
commit650f6700d28802c44196299a57c0f958118abeef (patch)
tree09d0bfeda3609fa33f8b07080172c8c378690f2c
parent337738b77123cbfed07d53c9408eb74109856d0a (diff)
downloadglibc-650f6700d28802c44196299a57c0f958118abeef.zip
glibc-650f6700d28802c44196299a57c0f958118abeef.tar.gz
glibc-650f6700d28802c44196299a57c0f958118abeef.tar.bz2
* 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.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/generic/tmpfile.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f117209..3974fc3 100644
--- 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
--- 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);