diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 14:34:15 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 14:34:15 -0400 |
| commit | 3ce1f2959437e952b9db4eaeed2407424f11a4d1 (patch) | |
| tree | db47da854c7d3bfc2c3bce4c6fc8381075ac9ec4 /stdio-common | |
| parent | 1248c1c41508387ff282b208636737e8cdc9b5b0 (diff) | |
| download | glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.zip glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.gz glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.bz2 | |
Cleanup of configuration options
Make several tool features mandatory and simplify the code.
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/printf_fphex.c | 22 | ||||
| -rw-r--r-- | stdio-common/tmpfile.c | 14 |
2 files changed, 14 insertions, 22 deletions
diff --git a/stdio-common/printf_fphex.c b/stdio-common/printf_fphex.c index 551c873..284cc6e 100644 --- a/stdio-common/printf_fphex.c +++ b/stdio-common/printf_fphex.c @@ -1,5 +1,5 @@ /* Print floating point number in hexadecimal notation according to ISO C99. - Copyright (C) 1997-2002,2004,2006 Free Software Foundation, Inc. + Copyright (C) 1997-2002,2004,2006,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -35,22 +35,16 @@ /* This defines make it possible to use the same code for GNU C library and the GNU I/O library. */ -#ifdef USE_IN_LIBIO -# include <libioP.h> -# define PUT(f, s, n) _IO_sputn (f, s, n) -# define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n)) +#include <libioP.h> +#define PUT(f, s, n) _IO_sputn (f, s, n) +#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n)) /* We use this file GNU C library and GNU I/O library. So make names equal. */ -# undef putc -# define putc(c, f) (wide \ +#undef putc +#define putc(c, f) (wide \ ? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f)) -# define size_t _IO_size_t -# define FILE _IO_FILE -#else /* ! USE_IN_LIBIO */ -# define PUT(f, s, n) fwrite (s, 1, n, f) -# define PAD(f, c, n) __printf_pad (f, c, n) -ssize_t __printf_pad (FILE *, char pad, int n) __THROW; /* In vfprintf.c. */ -#endif /* USE_IN_LIBIO */ +#define size_t _IO_size_t +#define FILE _IO_FILE /* Macros for doing the actual output. */ diff --git a/stdio-common/tmpfile.c b/stdio-common/tmpfile.c index 69963fd..b1507ae 100644 --- a/stdio-common/tmpfile.c +++ b/stdio-common/tmpfile.c @@ -1,5 +1,5 @@ /* Open a stdio stream on an anonymous temporary file. Generic/POSIX version. - Copyright (C) 1991,1993,1996-2000,2002,2003,2007,2009 + Copyright (C) 1991,1993,1996-2000,2002,2003,2007,2009,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -22,12 +22,10 @@ #include <stdio.h> #include <unistd.h> -#ifdef USE_IN_LIBIO -# include <iolibio.h> -# define __fdopen INTUSE(_IO_fdopen) -# ifndef tmpfile -# define tmpfile __new_tmpfile -# endif +#include <iolibio.h> +#define __fdopen INTUSE(_IO_fdopen) +#ifndef tmpfile +# define tmpfile __new_tmpfile #endif @@ -62,7 +60,7 @@ tmpfile (void) return f; } -#if defined USE_IN_LIBIO && !defined FLAGS /* Not for tmpfile64. */ +#ifndef FLAGS /* Not for tmpfile64. */ # undef tmpfile # include <shlib-compat.h> versioned_symbol (libc, __new_tmpfile, tmpfile, GLIBC_2_1); |