OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include wchar.h and wctype.h unconditionally

Browse Source 
As gnulib modules wchar and wctype is imported, we can include wchar.h
and wctype.h unconditionally.  This patch is also to remove HAVE_WCHAR_H
check.

gdb:

2014-11-21  Yao Qi  <yao@codesourcery.com>

	* gdb_wchar.h: Include wchar.h and wctype.h.
	[HAVE_ICONV && HAVE_BTOWC]: Don't check HAVE_WCHAR_T and don't
	include wchar.h and wctype.h.
	Don't check HAVE_WCHAR_H.
This commit is contained in:
Yao Qi 2014-11-21 22:05:41 +08:00
parent f0c00af8b4
commit e01e2baa69
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2014-11-21 Yao Qi <yao@codesourcery.com>
* gdb_wchar.h: Include wchar.h and wctype.h.
[HAVE_ICONV && HAVE_BTOWC]: Don't check HAVE_WCHAR_T and don't
include wchar.h and wctype.h.
Don't check HAVE_WCHAR_H.
2014-11-21 Yao Qi <yao@codesourcery.com> 2014-11-21 Yao Qi <yao@codesourcery.com>
* gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add wchar * gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add wchar

10
gdb/gdb_wchar.h
View File

@ -49,18 +49,18 @@
#define PHONY_ICONV #define PHONY_ICONV
#endif #endif
#include <wchar.h>
#include <wctype.h>
/* We use "btowc" as a sentinel to detect functioning wchar_t support. /* We use "btowc" as a sentinel to detect functioning wchar_t support.
We check for either __STDC_ISO_10646__ or a new-enough libiconv in We check for either __STDC_ISO_10646__ or a new-enough libiconv in
order to ensure we can convert to and from wchar_t. We choose order to ensure we can convert to and from wchar_t. We choose
libiconv version 0x108 because it is the first version with libiconv version 0x108 because it is the first version with
iconvlist. */ iconvlist. */
#if defined (HAVE_ICONV) && defined (HAVE_WCHAR_H) && defined (HAVE_BTOWC) \ #if defined (HAVE_ICONV) && defined (HAVE_BTOWC) \
&& (defined (__STDC_ISO_10646__) \ && (defined (__STDC_ISO_10646__) \
|| (defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108)) || (defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108))
#include <wchar.h>
#include <wctype.h>
typedef wchar_t gdb_wchar_t; typedef wchar_t gdb_wchar_t;
typedef wint_t gdb_wint_t; typedef wint_t gdb_wint_t;
@ -94,7 +94,7 @@ const char *intermediate_encoding (void);
/* If we got here and have wchar_t support, we might be on a system /* If we got here and have wchar_t support, we might be on a system
with some problem. So, we just disable everything. */ with some problem. So, we just disable everything. */
#if defined (HAVE_WCHAR_H) && defined (HAVE_BTOWC) #if defined (HAVE_BTOWC)
#define PHONY_ICONV #define PHONY_ICONV
#endif #endif