summary refs log tree commit diff
path: root/stdio-common/vfscanf.c
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2012-05-23 13:33:15 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2012-05-24 23:06:20 +0200
commitd18ea0c5e669dd48ccceccfc90ff458dc333a81f (patch)
treec983ef90b2cf0abb23a33e704d0a2b7200142ab6 /stdio-common/vfscanf.c
parentc14874927b499ddfdbb03745bb32bfc778b8595f (diff)
downloadglibc-d18ea0c5e669dd48ccceccfc90ff458dc333a81f.tar.gz
glibc-d18ea0c5e669dd48ccceccfc90ff458dc333a81f.tar.xz
glibc-d18ea0c5e669dd48ccceccfc90ff458dc333a81f.zip
Remove use of INTDEF/INTUSE in libio
Diffstat (limited to 'stdio-common/vfscanf.c')
-rw-r--r--stdio-common/vfscanf.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index ae251556e3..23a8ac7694 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2007, 2010, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -77,9 +77,9 @@
 #ifdef COMPILE_WSCANF
 # define ungetc(c, s)	((void) (c == WEOF				      \
 				 || (--read_in,				      \
-				     INTUSE(_IO_sputbackwc) (s, c))))
+				     _IO_sputbackwc (s, c))))
 # define ungetc_not_eof(c, s)	((void) (--read_in,			      \
-					 INTUSE(_IO_sputbackwc) (s, c)))
+					 _IO_sputbackwc (s, c)))
 # define inchar()	(c == WEOF ? ((errno = inchar_errno), WEOF)	      \
 			 : ((c = _IO_getwc_unlocked (s)),		      \
 			    (void) (c != WEOF				      \
@@ -109,9 +109,9 @@
 #else
 # define ungetc(c, s)	((void) ((int) c == EOF				      \
 				 || (--read_in,				      \
-				     INTUSE(_IO_sputbackc) (s, (unsigned char) c))))
+				     _IO_sputbackc (s, (unsigned char) c))))
 # define ungetc_not_eof(c, s)	((void) (--read_in,			      \
-					 INTUSE(_IO_sputbackc) (s, (unsigned char) c)))
+					 _IO_sputbackc (s, (unsigned char) c)))
 # define inchar()	(c == EOF ? ((errno = inchar_errno), EOF)	      \
 			 : ((c = _IO_getc_unlocked (s)),		      \
 			    (void) (c != EOF				      \
@@ -2941,6 +2941,7 @@ ___vfscanf (FILE *s, const char *format, va_list argptr)
   return _IO_vfscanf_internal (s, format, argptr, NULL);
 }
 ldbl_strong_alias (_IO_vfscanf_internal, _IO_vfscanf)
+ldbl_hidden_def (_IO_vfscanf_internal, _IO_vfscanf)
 ldbl_strong_alias (___vfscanf, __vfscanf)
 ldbl_hidden_def (___vfscanf, __vfscanf)
 ldbl_weak_alias (___vfscanf, vfscanf)