diff options
author | Jakub Jelinek <jakub@redhat.com> | 2005-07-21 08:25:57 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2005-07-21 08:25:57 +0000 |
commit | 736e2ab430e006ba09a2fe34d7887d3812ac808f (patch) | |
tree | f2d5948776e91112fcfd9199a757cd58e1be867a /libio | |
parent | 366c71f353afc163b8d31c9db6e90919b5c2e1c0 (diff) |
Updated to fedora-glibc-20050721T0814
Diffstat (limited to 'libio')
-rw-r--r-- | libio/strfile.h | 13 | ||||
-rw-r--r-- | libio/vswprintf.c | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/libio/strfile.h b/libio/strfile.h index b91111a9d6..53a36a3db8 100644 --- a/libio/strfile.h +++ b/libio/strfile.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 1998, 1999, 2005 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 @@ -73,3 +73,14 @@ typedef struct } _IO_strnfile; extern const struct _IO_jump_t _IO_strn_jumps attribute_hidden; + + +typedef struct +{ + _IO_strfile f; + /* This is used for the characters which do not fit in the buffer + provided by the user. */ + wchar_t overflow_buf[64]; +} _IO_wstrnfile; + +extern const struct _IO_jump_t _IO_wstrn_jumps attribute_hidden; diff --git a/libio/vswprintf.c b/libio/vswprintf.c index 42168aade4..eda8495241 100644 --- a/libio/vswprintf.c +++ b/libio/vswprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994,1997,1999-2002,2004 Free Software Foundation, Inc. +/* Copyright (C) 1994,1997,1999-2002,2004,2005 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 @@ -29,15 +29,6 @@ #include "strfile.h" -typedef struct -{ - _IO_strfile f; - /* This is used for the characters which do not fit in the buffer - provided by the user. */ - wchar_t overflow_buf[64]; -} _IO_wstrnfile; - - static wint_t _IO_wstrn_overflow (_IO_FILE *fp, wint_t c) __THROW; static wint_t @@ -75,7 +66,7 @@ _IO_wstrn_overflow (fp, c) } -static const struct _IO_jump_t _IO_wstrn_jumps = +const struct _IO_jump_t _IO_wstrn_jumps attribute_hidden = { JUMP_INIT_DUMMY, JUMP_INIT(finish, _IO_wstr_finish), |