qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2003-11-15  Ulrich Drepper  <drepper@redhat.com>

	* wcsmbs/mbsinit.c: Undef mbsinit and __mbsinit.
	* include/wchar.h: Provide inline versions of mbsinit and __mbsinit.
This commit is contained in:
Ulrich Drepper 2003-11-15 21:58:21 +00:00
parent ecdcadbd16
commit 2def87644d
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-11-15 Ulrich Drepper <drepper@redhat.com>
* wcsmbs/mbsinit.c: Undef mbsinit and __mbsinit.
* include/wchar.h: Provide inline versions of mbsinit and __mbsinit.
2003-11-14 Jakub Jelinek <jakub@redhat.com> 2003-11-14 Jakub Jelinek <jakub@redhat.com>
* posix/tst-rxspencer.c (check_match): @ without any following * posix/tst-rxspencer.c (check_match): @ without any following

7
include/wchar.h
View File

@ -113,5 +113,12 @@ extern int __vfwprintf (__FILE *__restrict __s,
/* Internal functions. */ /* Internal functions. */
extern size_t __mbsrtowcs_l (wchar_t *dst, const char **src, size_t len, extern size_t __mbsrtowcs_l (wchar_t *dst, const char **src, size_t len,
mbstate_t *ps, __locale_t l) attribute_hidden; mbstate_t *ps, __locale_t l) attribute_hidden;
/* Special version. We know that all uses of mbsinit inside the libc
have a non-NULL parameter. And certainly we can access the
internals of the data structure directly. */
# define mbsinit(state) ((state)->__count == 0)
# define __mbsinit(state) ((state)->__count == 0)
# endif # endif
#endif #endif

5
wcsmbs/mbsinit.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. /* Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
@ -20,6 +20,9 @@
#include <string.h> #include <string.h>
#include <wchar.h> #include <wchar.h>
#undef mbsinit
#undef __mbsinit
/* In GNU libc the conversion functions only can convert between the /* In GNU libc the conversion functions only can convert between the
fixed wide character representation and the multibyte fixed wide character representation and the multibyte
representation of the same character set. Since we use ISO 10646 representation of the same character set. Since we use ISO 10646