about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/stdio-lock.h4
-rw-r--r--sysdeps/ieee754/ldbl-opt/nldbl-compat.c3
-rw-r--r--sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c2
-rw-r--r--sysdeps/nptl/stdio-lock.h4
4 files changed, 6 insertions, 7 deletions
diff --git a/sysdeps/generic/stdio-lock.h b/sysdeps/generic/stdio-lock.h
index 2c7a1a48b0..4a40618545 100644
--- a/sysdeps/generic/stdio-lock.h
+++ b/sysdeps/generic/stdio-lock.h
@@ -50,13 +50,13 @@ __libc_lock_define_recursive (typedef, _IO_lock_t)
 # ifdef __EXCEPTIONS
 # define _IO_acquire_lock(_fp) \
   do {									      \
-    _IO_FILE *_IO_acquire_lock_file					      \
+    FILE *_IO_acquire_lock_file						      \
 	__attribute__((cleanup (_IO_acquire_lock_fct)))			      \
 	= (_fp);							      \
     _IO_flockfile (_IO_acquire_lock_file);
 #  define _IO_acquire_lock_clear_flags2(_fp) \
   do {									      \
-    _IO_FILE *_IO_acquire_lock_file					      \
+    FILE *_IO_acquire_lock_file						      \
 	__attribute__((cleanup (_IO_acquire_lock_clear_flags2_fct)))	      \
 	= (_fp);							      \
     _IO_flockfile (_IO_acquire_lock_file);
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
index 7280d48ac5..bf54090d4f 100644
--- a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
+++ b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
@@ -333,8 +333,7 @@ __nldbl_wprintf (const wchar_t *fmt, ...)
 
 int
 attribute_compat_text_section
-__nldbl__IO_vfscanf (FILE *s, const char *fmt, _IO_va_list ap,
-		    int *errp)
+__nldbl__IO_vfscanf (FILE *s, const char *fmt, va_list ap, int *errp)
 {
   int res;
   set_no_long_double ();
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c b/sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c
index 05581c0354..442c11c203 100644
--- a/sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c
+++ b/sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c
@@ -2,7 +2,7 @@
 
 int
 attribute_hidden
-_IO_vfscanf (FILE *s, const char *fmt, _IO_va_list ap, int *errp)
+_IO_vfscanf (FILE *s, const char *fmt, va_list ap, int *errp)
 {
   return __nldbl__IO_vfscanf (s, fmt, ap, errp);
 }
diff --git a/sysdeps/nptl/stdio-lock.h b/sysdeps/nptl/stdio-lock.h
index 518b906327..5b9782452f 100644
--- a/sysdeps/nptl/stdio-lock.h
+++ b/sysdeps/nptl/stdio-lock.h
@@ -90,13 +90,13 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
 # ifdef __EXCEPTIONS
 #  define _IO_acquire_lock(_fp) \
   do {									      \
-    _IO_FILE *_IO_acquire_lock_file					      \
+    FILE *_IO_acquire_lock_file						      \
 	__attribute__((cleanup (_IO_acquire_lock_fct)))			      \
 	= (_fp);							      \
     _IO_flockfile (_IO_acquire_lock_file);
 #  define _IO_acquire_lock_clear_flags2(_fp) \
   do {									      \
-    _IO_FILE *_IO_acquire_lock_file					      \
+    FILE *_IO_acquire_lock_file						      \
 	__attribute__((cleanup (_IO_acquire_lock_clear_flags2_fct)))	      \
 	= (_fp);							      \
     _IO_flockfile (_IO_acquire_lock_file);