From d9a26469dfeaaa054fd884bf626a8f4152d72b3e Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 30 May 2011 18:44:22 +0000 Subject: [PATCH] Fix #6969 (hopefully for real this time): * move all the isw... functions from wchar.h to wctype.h (just following version 7 of the POSIX base specs) * remove all declarations from wchar.h that are in wctype.h, too git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41832 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/posix/wchar.h | 18 +----------------- headers/posix/wctype.h | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/headers/posix/wchar.h b/headers/posix/wchar.h index f9ab3513e6..81de5cc6fe 100644 --- a/headers/posix/wchar.h +++ b/headers/posix/wchar.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Haiku Inc. All Rights Reserved. + * Copyright 2008-2011 Haiku Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ #ifndef _WCHAR_H @@ -59,19 +59,6 @@ extern int fwscanf(FILE *, const wchar_t *, ...); extern wint_t getwc(FILE *); extern wint_t getwchar(void); -extern int iswalnum(wint_t); -extern int iswalpha(wint_t); -extern int iswcntrl(wint_t); -extern int iswctype(wint_t, wctype_t); -extern int iswdigit(wint_t); -extern int iswgraph(wint_t); -extern int iswlower(wint_t); -extern int iswprint(wint_t); -extern int iswpunct(wint_t); -extern int iswspace(wint_t); -extern int iswupper(wint_t); -extern int iswxdigit(wint_t); - extern size_t mbrlen(const char *s, size_t n, mbstate_t *ps); extern size_t mbrtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps); extern int mbsinit(const mbstate_t *); @@ -84,8 +71,6 @@ extern wint_t putwchar(wchar_t); extern int swprintf(wchar_t *, size_t, const wchar_t *, ...); extern int swscanf(const wchar_t *, const wchar_t *, ...); -extern wint_t towlower(wint_t); -extern wint_t towupper(wint_t); extern wint_t ungetwc(wint_t, FILE *); extern int vfwprintf(FILE *, const wchar_t *, va_list); @@ -126,7 +111,6 @@ extern wchar_t *wcswcs(const wchar_t *, const wchar_t *); extern int wcswidth(const wchar_t *, size_t); extern size_t wcsxfrm(wchar_t *, const wchar_t *, size_t); extern int wctob(wint_t); -extern wctype_t wctype(const char *); extern int wcwidth(wchar_t); extern wchar_t *wmemchr(const wchar_t *, wchar_t, size_t); extern int wmemcmp(const wchar_t *, const wchar_t *, size_t); diff --git a/headers/posix/wctype.h b/headers/posix/wctype.h index bb0cfaeb73..f71bac7393 100644 --- a/headers/posix/wctype.h +++ b/headers/posix/wctype.h @@ -1,5 +1,5 @@ /* - * Copyright 2005-2010 Haiku Inc. All Rights Reserved. + * Copyright 2005-2011 Haiku Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ #ifndef _WCTYPE_H_ @@ -14,6 +14,19 @@ typedef int wctrans_t; extern "C" { #endif +extern int iswalnum(wint_t wc); +extern int iswalpha(wint_t wc); +extern int iswcntrl(wint_t wc); +extern int iswctype(wint_t wc, wctype_t desc); +extern int iswdigit(wint_t wc); +extern int iswgraph(wint_t wc); +extern int iswlower(wint_t wc); +extern int iswprint(wint_t wc); +extern int iswpunct(wint_t wc); +extern int iswspace(wint_t wc); +extern int iswupper(wint_t wc); +extern int iswxdigit(wint_t wc); + extern int iswblank(wint_t wc); extern wint_t towctrans(wint_t wc, wctrans_t transition);