aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-07-24 19:52:01 +0000
committerUlrich Drepper <drepper@redhat.com>2005-07-24 19:52:01 +0000
commit76c98ee22b23ccd59684b32dd7af7e110687d79c (patch)
tree963ea0ac5ef51e1a9dae65510559eb4de1df3a76
parent84d2b24050f6e6783a5db95ab505a6b54b9a3ff2 (diff)
downloadglibc-76c98ee22b23ccd59684b32dd7af7e110687d79c.tar
glibc-76c98ee22b23ccd59684b32dd7af7e110687d79c.tar.gz
glibc-76c98ee22b23ccd59684b32dd7af7e110687d79c.tar.bz2
glibc-76c98ee22b23ccd59684b32dd7af7e110687d79c.zip
* wcsmbs/bits/wchar2.h: Use __FILE not FILE.
* stdio-common/fxprintf.c (__fxprintf): Define variable more local.
-rw-r--r--ChangeLog6
-rw-r--r--wcsmbs/bits/wchar2.h16
2 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index bf148b760e..028c47ea2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+2005-07-24 Ulrich Drepper <drepper@redhat.com>
+
+ * wcsmbs/bits/wchar2.h: Use __FILE not FILE.
+
2005-07-22 Ulrich Drepper <drepper@redhat.com>
- * stdio-common/fxprintf.c (__fxprintf): Declare functions more local.
+ * stdio-common/fxprintf.c (__fxprintf): Define variable more local.
2005-07-22 Jakub Jelinek <jakub@redhat.com>
diff --git a/wcsmbs/bits/wchar2.h b/wcsmbs/bits/wchar2.h
index 29bfad0110..5e6396f048 100644
--- a/wcsmbs/bits/wchar2.h
+++ b/wcsmbs/bits/wchar2.h
@@ -230,11 +230,11 @@ vswprintf (wchar_t *__s, size_t __n, __const wchar_t *__format,
#if __USE_FORTIFY_LEVEL > 1
-extern int __fwprintf_chk (FILE *__restrict __stream, int __flag,
+extern int __fwprintf_chk (__FILE *__restrict __stream, int __flag,
__const wchar_t *__restrict __format, ...);
extern int __wprintf_chk (int __flag, __const wchar_t *__restrict __format,
...);
-extern int __vfwprintf_chk (FILE *__restrict __stream, int __flag,
+extern int __vfwprintf_chk (__FILE *__restrict __stream, int __flag,
__const wchar_t *__restrict __format,
__gnuc_va_list __ap);
extern int __vwprintf_chk (int __flag, __const wchar_t *__restrict __format,
@@ -252,13 +252,13 @@ extern int __vwprintf_chk (int __flag, __const wchar_t *__restrict __format,
#endif
extern wchar_t *__fgetws_chk (wchar_t *__restrict __s, size_t __size, int __n,
- FILE *__restrict __stream) __wur;
+ __FILE *__restrict __stream) __wur;
extern wchar_t *__REDIRECT (__fgetws_alias,
(wchar_t *__restrict __s, int __n,
- FILE *__restrict __stream), fgetws) __wur;
+ __FILE *__restrict __stream), fgetws) __wur;
extern __always_inline __wur wchar_t *
-fgetws (wchar_t *__restrict __s, int __n, FILE *__restrict __stream)
+fgetws (wchar_t *__restrict __s, int __n, __FILE *__restrict __stream)
{
if (__bos (__s) != (size_t) -1
&& (!__builtin_constant_p (__n) || (size_t) __n > __bos (__s)))
@@ -268,15 +268,15 @@ fgetws (wchar_t *__restrict __s, int __n, FILE *__restrict __stream)
#ifdef __USE_GNU
extern wchar_t *__fgetws_unlocked_chk (wchar_t *__restrict __s, size_t __size,
- int __n, FILE *__restrict __stream)
+ int __n, __FILE *__restrict __stream)
__wur;
extern wchar_t *__REDIRECT (__fgetws_unlocked_alias,
(wchar_t *__restrict __s, int __n,
- FILE *__restrict __stream), fgetws_unlocked)
+ __FILE *__restrict __stream), fgetws_unlocked)
__wur;
extern __always_inline __wur wchar_t *
-fgetws_unlocked (wchar_t *__restrict __s, int __n, FILE *__restrict __stream)
+fgetws_unlocked (wchar_t *__restrict __s, int __n, __FILE *__restrict __stream)
{
if (__bos (__s) != (size_t) -1
&& (!__builtin_constant_p (__n) || (size_t) __n > __bos (__s)))