From f042f18f936c0ebe2ece3dcdeb657a833dba5bb0 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 21 Jun 1999 16:46:16 +0000 Subject: Update. 1999-06-21 Andreas Schwab * libio/Makefile (routines): Add putwchar and putwchar_u. * libio/putwchar.c: Include instead of "stdio.h". * libio/putwchar_u.c: Likewise. Use _IO_stdout instead of stdout. Fix parameter name. * libio/getchar.c: Consistently use _IO_stdin instead of stdin. * libio/getchar_u.c: Likewise. * libio/putchar_u.c: Use _IO_stdout instead of stdout. 1999-06-21 Andreas Schwab * include/features.h (__GNUC_PREREQ): Don't generate `defined' via macro expansion---it's undefined. Properly parenthesize substituted parameters. (__GLIBC_PREREQ): Likewise. --- ChangeLog | 20 ++++++++++++++++++++ include/features.h | 13 +++++++++---- libio/Makefile | 5 +++-- libio/getchar.c | 5 +++-- libio/getchar_u.c | 2 +- libio/putchar_u.c | 4 ++-- libio/putwchar.c | 2 +- libio/putwchar_u.c | 10 +++++----- 8 files changed, 44 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 964082b2b9..f1fd42ca00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +1999-06-21 Andreas Schwab + + * libio/Makefile (routines): Add putwchar and putwchar_u. + + * libio/putwchar.c: Include instead of "stdio.h". + * libio/putwchar_u.c: Likewise. Use _IO_stdout instead of + stdout. Fix parameter name. + + * libio/getchar.c: Consistently use _IO_stdin instead of stdin. + * libio/getchar_u.c: Likewise. + + * libio/putchar_u.c: Use _IO_stdout instead of stdout. + +1999-06-21 Andreas Schwab + + * include/features.h (__GNUC_PREREQ): Don't generate `defined' via + macro expansion---it's undefined. Properly parenthesize + substituted parameters. + (__GLIBC_PREREQ): Likewise. + 1999-06-21 Ulrich Drepper * Makeconfig (CPPFLAGS): Revert last change. It has too many diff --git a/include/features.h b/include/features.h index 88be470025..f04184ac12 100644 --- a/include/features.h +++ b/include/features.h @@ -251,10 +251,15 @@ #endif Note - they won't work for gcc1 or glibc1, since the _MINOR macros were not defined then. */ -#define __GNUC_PREREQ(maj,min) (defined __GNUC__ && defined __GNUC_MINOR__ \ - && ((__GNUC__ << 16) + __GNUC_MINOR__) >= ((maj<<16) + min)) -#define __GLIBC_PREREQ(maj,min) (defined __GLIBC__ && defined __GLIBC_MINOR__ \ - && ((__GLIBC__ << 16) + __GLIBC_MINOR__) >= ((maj<<16) + min)) +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else +# define __GNUC_PREREQ(maj, min) 0 +#endif + +#define __GLIBC_PREREQ(maj, min) \ + ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) /* This is here only because every header file already includes this one. */ #ifndef __ASSEMBLER__ diff --git a/libio/Makefile b/libio/Makefile index 6759b84f1d..258ff10cb3 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -32,8 +32,9 @@ routines := \ iofgetpos64 iofopen64 iofsetpos64 \ fputwc fputwc_u getwc getwc_u getwchar getwchar_u iofgetws iofgetws_u \ iofputws iofputws_u iogetwline iowpadn ioungetwc putwc putwc_u \ - putchar putchar_u swprintf vwprintf wprintf wscanf fwscanf vwscanf \ - vswprintf iovswscanf swscanf wgenops wstrops wfileops iofwide \ + putwchar putwchar_u putchar putchar_u swprintf vwprintf wprintf \ + wscanf fwscanf vwscanf vswprintf iovswscanf swscanf wgenops wstrops \ + wfileops iofwide \ \ clearerr feof ferror fileno fputc freopen fseek getc getchar \ memstream pclose putc putchar rewind setbuf setlinebuf vasprintf \ diff --git a/libio/getchar.c b/libio/getchar.c index fdc2ec3a87..80c297f0ae 100644 --- a/libio/getchar.c +++ b/libio/getchar.c @@ -32,9 +32,10 @@ int getchar () { int result; - _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, stdin); + _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, + _IO_stdin); _IO_flockfile (_IO_stdin); - result = _IO_getc_unlocked (stdin); + result = _IO_getc_unlocked (_IO_stdin); _IO_funlockfile (_IO_stdin); _IO_cleanup_region_end (0); return result; diff --git a/libio/getchar_u.c b/libio/getchar_u.c index bfbe56b30c..0c8fb81151 100644 --- a/libio/getchar_u.c +++ b/libio/getchar_u.c @@ -31,5 +31,5 @@ int getchar_unlocked () { - return _IO_getc_unlocked (stdin); + return _IO_getc_unlocked (_IO_stdin); } diff --git a/libio/putchar_u.c b/libio/putchar_u.c index f8f387ac4e..6800695dd0 100644 --- a/libio/putchar_u.c +++ b/libio/putchar_u.c @@ -25,6 +25,6 @@ int putchar_unlocked (c) int c; { - CHECK_FILE (stdout, EOF); - return _IO_putc_unlocked (c, stdout); + CHECK_FILE (_IO_stdout, EOF); + return _IO_putc_unlocked (c, _IO_stdout); } diff --git a/libio/putwchar.c b/libio/putwchar.c index a4e8411831..dbb2194255 100644 --- a/libio/putwchar.c +++ b/libio/putwchar.c @@ -17,7 +17,7 @@ Boston, MA 02111-1307, USA. */ #include "libioP.h" -#include "stdio.h" +#include wint_t putwchar (wc) diff --git a/libio/putwchar_u.c b/libio/putwchar_u.c index c8add84146..62c5eb9c2c 100644 --- a/libio/putwchar_u.c +++ b/libio/putwchar_u.c @@ -17,12 +17,12 @@ Boston, MA 02111-1307, USA. */ #include "libioP.h" -#include "stdio.h" +#include wint_t -putwchar_unlocked (c) - wchar_t c; +putwchar_unlocked (wc) + wchar_t wc; { - CHECK_FILE (stdout, WEOF); - return _IO_putwc_unlocked (wc, stdout); + CHECK_FILE (_IO_stdout, WEOF); + return _IO_putwc_unlocked (wc, _IO_stdout); } -- cgit v1.2.3