about summary refs log tree commit diff
path: root/libio/getchar.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-06-21 16:46:16 +0000
committerUlrich Drepper <drepper@redhat.com>1999-06-21 16:46:16 +0000
commitf042f18f936c0ebe2ece3dcdeb657a833dba5bb0 (patch)
tree6026e179df3233daccb297a8861c654c1ec4d5db /libio/getchar.c
parentae8b36f7ec9f3e8f7a6f52154b3e92669e8681a5 (diff)
downloadglibc-f042f18f936c0ebe2ece3dcdeb657a833dba5bb0.tar.gz
glibc-f042f18f936c0ebe2ece3dcdeb657a833dba5bb0.tar.xz
glibc-f042f18f936c0ebe2ece3dcdeb657a833dba5bb0.zip
Update.
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.
Diffstat (limited to 'libio/getchar.c')
-rw-r--r--libio/getchar.c5
1 files changed, 3 insertions, 2 deletions
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;