1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-09-01 05:02:03 +03:00
1999-06-21  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* libio/Makefile (routines): Add putwchar and putwchar_u.

	* libio/putwchar.c: Include <wchar.h> 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  <schwab@issan.cs.uni-dortmund.de>

	* include/features.h (__GNUC_PREREQ): Don't generate `defined' via
	macro expansion---it's undefined.  Properly parenthesize
	substituted parameters.
	(__GLIBC_PREREQ): Likewise.
This commit is contained in:
Ulrich Drepper
1999-06-21 16:46:16 +00:00
parent ae8b36f7ec
commit f042f18f93
8 changed files with 44 additions and 17 deletions

View File

@@ -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 \

View File

@@ -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;

View File

@@ -31,5 +31,5 @@
int
getchar_unlocked ()
{
return _IO_getc_unlocked (stdin);
return _IO_getc_unlocked (_IO_stdin);
}

View File

@@ -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);
}

View File

@@ -17,7 +17,7 @@
Boston, MA 02111-1307, USA. */
#include "libioP.h"
#include "stdio.h"
#include <wchar.h>
wint_t
putwchar (wc)

View File

@@ -17,12 +17,12 @@
Boston, MA 02111-1307, USA. */
#include "libioP.h"
#include "stdio.h"
#include <wchar.h>
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);
}