AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify wint_t handling in wchar.h and wctype.h.

Browse Source 
Fix a few typos in the process.
This commit is contained in:
Ulrich Drepper 2010-03-24 06:59:02 -07:00
parent 04f2902d9f
commit 9ac9129d49
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2010-03-24 Ulrich Drepper <drepper@redhat.com>
[BZ #11410]
* wctype/wctype.h: Use <wchar.h> to get the wint_t definition.
* wcsmbs/wchar.h: Correct preprocessor directive indentation. Move
C++ prototype handling to a better place.
2010-03-18 Ulrich Drepper <drepper@redhat.com> 2010-03-18 Ulrich Drepper <drepper@redhat.com>
* elf/dl-load.c (open_verify): Extend expected to the full size of the * elf/dl-load.c (open_verify): Extend expected to the full size of the

16
wcsmbs/wchar.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995-2008, 2009 Free Software Foundation, Inc. /* Copyright (C) 1995-2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -51,11 +51,6 @@
# define __need_wint_t # define __need_wint_t
# include <stddef.h> # include <stddef.h>
/* Tell the caller that we provide correct C++ prototypes. */
#if defined __cplusplus && __GNUC_PREREQ (4, 4)
# define __CORRECT_ISO_CPP_WCHAR_H_PROTO
#endif
/* We try to get wint_t from <stddef.h>, but not all GCC versions define it /* We try to get wint_t from <stddef.h>, but not all GCC versions define it
there. So define it ourselves if it remains undefined. */ there. So define it ourselves if it remains undefined. */
# ifndef _WINT_T # ifndef _WINT_T
@ -75,6 +70,11 @@ typedef __WINT_TYPE__ wint_t;
__END_NAMESPACE_STD __END_NAMESPACE_STD
# endif # endif
# endif # endif
/* Tell the caller that we provide correct C++ prototypes. */
# if defined __cplusplus && __GNUC_PREREQ (4, 4)
# define __CORRECT_ISO_CPP_WCHAR_H_PROTO
# endif
#endif #endif
#if (defined _WCHAR_H || defined __need_mbstate_t) && !defined __mbstate_t_defined #if (defined _WCHAR_H || defined __need_mbstate_t) && !defined __mbstate_t_defined
@ -219,7 +219,7 @@ __BEGIN_NAMESPACE_STD
extern "C++" wchar_t *wcschr (wchar_t *__wcs, wchar_t __wc) extern "C++" wchar_t *wcschr (wchar_t *__wcs, wchar_t __wc)
__THROW __asm ("wcschr") __attribute_pure__; __THROW __asm ("wcschr") __attribute_pure__;
extern "C++" __const wchar_t *wcschr (__const wchar_t *__wcs, wchar_t __wc) extern "C++" __const wchar_t *wcschr (__const wchar_t *__wcs, wchar_t __wc)
__THROW __asm ("wcschr") __attribute_pure__; __THROW __asm ("wcschr") __attribute_pure__;
#else #else
extern wchar_t *wcschr (__const wchar_t *__wcs, wchar_t __wc) extern wchar_t *wcschr (__const wchar_t *__wcs, wchar_t __wc)
__THROW __attribute_pure__; __THROW __attribute_pure__;
@ -892,7 +892,7 @@ __END_DECLS
#endif /* wchar.h */ #endif /* wchar.h */
/* Undefined all __need_* constants in case we are included to get those /* Undefine all __need_* constants in case we are included to get those
constants but the whole file was already read. */ constants but the whole file was already read. */
#undef __need_mbstate_t #undef __need_mbstate_t
#undef __need_wint_t #undef __need_wint_t

8
wctype/wctype.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996-2002,2005,2007,2008,2009 Free Software Foundation, Inc. /* Copyright (C) 1996-2002,2005,2007-2009,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -29,9 +29,9 @@
#ifndef __need_iswxxx #ifndef __need_iswxxx
# define _WCTYPE_H 1 # define _WCTYPE_H 1
/* Get wint_t from <stddef.h>. */ /* Get wint_t from <wchar.h>. */
# define __need_wint_t # define __need_wint_t
# include <stddef.h> # include <wchar.h>
/* Constant expression of type `wint_t' whose value does not correspond /* Constant expression of type `wint_t' whose value does not correspond
to any member of the extended character set. */ to any member of the extended character set. */
@ -204,7 +204,7 @@ __END_DECLS
/* The remaining definitions and declarations must not appear in the /* The remaining definitions and declarations must not appear in the
<wcsmbs.h> header. */ <wchar.h> header. */
#ifdef _WCTYPE_H #ifdef _WCTYPE_H
/* /*