[haiku-commits] r41832 - haiku/trunk/headers/posix
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 30 May 2011 20:44:22 +0200 (CEST)
Author: zooey
Date: 2011-05-30 20:44:22 +0200 (Mon, 30 May 2011)
New Revision: 41832
Changeset: https://dev.haiku-os.org/changeset/41832
Ticket: https://dev.haiku-os.org/ticket/6969
Modified:
haiku/trunk/headers/posix/wchar.h
haiku/trunk/headers/posix/wctype.h
Log:
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
Modified: haiku/trunk/headers/posix/wchar.h
===================================================================
--- haiku/trunk/headers/posix/wchar.h 2011-05-30 17:56:46 UTC (rev 41831)
+++ haiku/trunk/headers/posix/wchar.h 2011-05-30 18:44:22 UTC (rev 41832)
@@ -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 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 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 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);
Modified: haiku/trunk/headers/posix/wctype.h
===================================================================
--- haiku/trunk/headers/posix/wctype.h 2011-05-30 17:56:46 UTC (rev 41831)
+++ haiku/trunk/headers/posix/wctype.h 2011-05-30 18:44:22 UTC (rev 41832)
@@ -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 @@
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);
Other related posts:
- » [haiku-commits] r41832 - haiku/trunk/headers/posix - zooey
