Commit 3fc07440ba1804d781c25e837c65014845d2fd4d

Petr Ovtchenkov (Committer)
Tue Aug 18 10:28:00 CEST 2009
David Deakins <DavidDeakins @gm…l.com> (Author)
Mon Aug 17 00:15:10 CEST 2009

Tree SHA1: 9227f7b
Parent SHA1: d1d9d0f (Undef complex macro for Windows CE.)
raw diff | raw patch

Relocate the wide character support inlines for Windows CE.

Relocate the wide character support inlines
from ctype.h to wctype.h to better reflect
the standard location of these definitions.

Diff rendering mode:
inline
side by side


83	83
84	84	# undef _isctype
85	85
86		__inline int (iswalpha)(int c) { return iswctype((unsigned short)(c), _ALPHA); }
87		__inline int (iswupper)(int c) { return iswctype((unsigned short)(c), _UPPER); }
88		__inline int (iswlower)(int c) { return iswctype((unsigned short)(c), _LOWER); }
89		__inline int (iswdigit)(int c) { return iswctype((unsigned short)(c), _DIGIT); }
90		__inline int (iswxdigit)(int c) { return iswctype((unsigned short)(c), _HEX); }
91		__inline int (iswspace)(int c) { return iswctype((unsigned short)(c), _SPACE); }
92		__inline int (iswpunct)(int c) { return iswctype((unsigned short)(c), _PUNCT); }
93		__inline int (iswalnum)(int c) { return iswctype((unsigned short)(c), _ALPHA\|_DIGIT); }
94		__inline int (iswprint)(int c) { return iswctype((unsigned short)(c), _BLANK\|_PUNCT\|_ALPHA\|_DIGIT); }
95		__inline int (iswgraph)(int c) { return iswctype((unsigned short)(c), _PUNCT\|_ALPHA\|_DIGIT); }
96		__inline int (iswcntrl)(int c) { return iswctype((unsigned short)(c), _CONTROL); }
97		__inline int (iswascii)(int c) { return ((unsigned)(c) < 0x80); }
98
99	86	# endif /* UNDER_CE */
100	87
101	88	# endif /* _STLP_CTYPE_H_SEEN */


64	64	# else
65	65	# if defined (_STLP_HAS_INCLUDE_NEXT)
66	66	# include_next <wchar.h>
	67	# elif defined (_STLP_WCE_NET) && defined(_STLP_USE_WINCE_CRT_FUNCTIONS)
	68	# include <wchar.h>
67	69	# else
68	70	# include _STLP_NATIVE_C_HEADER(wchar.h)
69	71	# endif
…	…
268	268
269	269	# if !defined (_STLP_WCE_NET)
270	270	using _STLP_VENDOR_CSTD::wcscoll;
	271	# endif
	272	# if !defined (_STLP_WCE_NET) \|\| defined(_STLP_USE_WINCE_CRT_FUNCTIONS)
271	273	using _STLP_VENDOR_CSTD::wcsxfrm;
272	274	# endif
273	275	using _STLP_VENDOR_CSTD::wcscat;


37	37	# endif
38	38	#endif
39	39
	40	#ifndef _STLP_WCTYPE_H_SEEN
	41	# define _STLP_WCTYPE_H_SEEN
	42
	43	/* Undef convenience interfaces */
	44	# undef iswalpha
	45	# undef iswupper
	46	# undef iswlower
	47	# undef iswdigit
	48	# undef iswxdigit
	49	# undef iswspace
	50	# undef iswpunct
	51	# undef iswalnum
	52	# undef iswprint
	53	# undef iswcntrl
	54	# undef iswgraph
	55	# undef iswascii
	56
	57	# if defined(UNDER_CE)
	58	__inline int (iswalpha)(int c) { return iswctype(c, _ALPHA); }
	59	__inline int (iswupper)(int c) { return iswctype(c, _UPPER); }
	60	__inline int (iswlower)(int c) { return iswctype(c, _LOWER); }
	61	__inline int (iswdigit)(int c) { return iswctype(c, _DIGIT); }
	62	__inline int (iswxdigit)(int c) { return iswctype(c, _HEX); }
	63	__inline int (iswspace)(int c) { return iswctype(c, _SPACE); }
	64	__inline int (iswpunct)(int c) { return iswctype(c, _PUNCT); }
	65	__inline int (iswalnum)(int c) { return iswctype(c, _ALPHA\|_DIGIT); }
	66	__inline int (iswprint)(int c) { return iswctype(c, _BLANK\|_PUNCT\|_ALPHA\|_DIGIT); }
	67	__inline int (iswgraph)(int c) { return iswctype(c, _PUNCT\|_ALPHA\|_DIGIT); }
	68	__inline int (iswcntrl)(int c) { return iswctype(c, _CONTROL); }
	69	__inline int (iswascii)(int c) { return ((unsigned)(c) < 0x80); }
	70	# endif
	71	#endif
	72
40	73	#if (_STLP_OUTERMOST_HEADER_ID == 0x279)
41	74	# if ! defined (_STLP_DONT_POP_HEADER_ID)
42	75	# include <stl/_epilog.h>

Commit 3fc07440ba1804d781c25e837c65014845d2fd4d

Gitorious