diff options
| author | Roland McGrath <roland@gnu.org> | 2003-04-26 22:32:41 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-04-26 22:32:41 +0000 |
| commit | a1e50cbbedb0bd5f0ee64971e4c594bd72d3daf4 (patch) | |
| tree | 0bd5e5902f33672d943a52683af8ce09c2b2e47a | |
| parent | 06a04e0924caa0ab4ac719e31c86f53501fc297d (diff) | |
| download | glibc-a1e50cbbedb0bd5f0ee64971e4c594bd72d3daf4.tar glibc-a1e50cbbedb0bd5f0ee64971e4c594bd72d3daf4.tar.gz glibc-a1e50cbbedb0bd5f0ee64971e4c594bd72d3daf4.tar.bz2 glibc-a1e50cbbedb0bd5f0ee64971e4c594bd72d3daf4.zip | |
2003-04-26 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/tmpfile.c: Remove USE_IN_LIBIO conditionals.
| -rw-r--r-- | sysdeps/mach/hurd/tmpfile.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/sysdeps/mach/hurd/tmpfile.c b/sysdeps/mach/hurd/tmpfile.c index 8ac80e2460..ea32d4a99e 100644 --- a/sysdeps/mach/hurd/tmpfile.c +++ b/sysdeps/mach/hurd/tmpfile.c @@ -1,5 +1,5 @@ /* Open a stdio stream on an anonymous temporary file. Hurd version. - Copyright (C) 2001,02 Free Software Foundation, Inc. + Copyright (C) 2001,2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,19 +23,14 @@ #include <hurd/fd.h> #include <fcntl.h> #include <unistd.h> - -#ifdef USE_IN_LIBIO -# include <iolibio.h> -# define __fdopen INTUSE(_IO_fdopen) -# define tmpfile __new_tmpfile -#endif +#include <iolibio.h> /* This returns a new stream opened on a temporary file (generated by tmpnam). The file is opened with mode "w+b" (binary read/write). If we couldn't generate a unique filename or the file couldn't be opened, NULL is returned. */ FILE * -tmpfile (void) +__tmpfile (void) { error_t err; file_t file; @@ -62,16 +57,13 @@ tmpfile (void) /* Open a stream on the unnamed file. It will cease to exist when this stream is closed. */ - if ((f = __fdopen (fd, "w+b")) == NULL) + if ((f = INTUSE(_IO_fdopen) (fd, "w+b")) == NULL) __close (fd); return f; } -#ifdef USE_IN_LIBIO -# undef tmpfile -# include <shlib-compat.h> -versioned_symbol (libc, __new_tmpfile, tmpfile, GLIBC_2_1); -#endif +#include <shlib-compat.h> +versioned_symbol (libc, __tmpfile, tmpfile, GLIBC_2_1); -weak_alias (tmpfile, tmpfile64) +weak_alias (__tmpfile, tmpfile64) |