From c4ca7a1202254850f884b810175c5aa9eeb808b7 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Mon, 13 Feb 2017 19:47:52 +0000 Subject: [PATCH] Add wchar.h and wctype.h compatibility shims using ucd-tools. This is applied to all platforms to provide consistent behaviour. --- src/include/compat/wchar.h | 38 +++++++++++++++++++++++++++++ src/include/compat/wctype.h | 48 +++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 src/include/compat/wchar.h create mode 100644 src/include/compat/wctype.h diff --git a/src/include/compat/wchar.h b/src/include/compat/wchar.h new file mode 100644 index 00000000..46b797fb --- /dev/null +++ b/src/include/compat/wchar.h @@ -0,0 +1,38 @@ +/* Compatibility shim for + * + * Copyright (C) 2017 Reece H. Dunn + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see: . + */ + +#ifdef _MSC_VER +#if _MSC_VER >= 1900 // Visual C++ 14 (Visual Studio 2015) and above... +#include <../ucrt/wchar.h> +#else +#include <../include/wchar.h> +#endif +#else +#pragma GCC system_header // Silence "warning: #include_next is a GCC extension" +#include_next +#endif + +#ifndef WCHAR_H_COMPAT_SHIM +#define WCHAR_H_COMPAT_SHIM + +#include + +#define towlower ucd_tolower +#define towupper ucd_toupper + +#endif diff --git a/src/include/compat/wctype.h b/src/include/compat/wctype.h new file mode 100644 index 00000000..de859e36 --- /dev/null +++ b/src/include/compat/wctype.h @@ -0,0 +1,48 @@ +/* Compatibility shim for + * + * Copyright (C) 2017 Reece H. Dunn + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see: . + */ + +#ifndef WCTYPE_H_COMPAT_SHIM +#define WCTYPE_H_COMPAT_SHIM + +#ifdef _MSC_VER +#if _MSC_VER >= 1900 // Visual C++ 14 (Visual Studio 2015) and above... +#include <../ucrt/wctype.h> +#else +#include <../include/wctype.h> +#endif +#else +#pragma GCC system_header // Silence "warning: #include_next is a GCC extension" +#include_next +#endif + +#include + +#define iswalnum ucd_isalnum +#define iswalpha ucd_isalpha +#define iswblank ucd_isblank +#define iswcntrl ucd_iscntrl +#define iswdigit ucd_isdigit +#define iswgraph ucd_isgraph +#define iswlower ucd_islower +#define iswprint ucd_isprint +#define iswpunct ucd_ispunct +#define iswspace ucd_isspace +#define iswupper ucd_isupper +#define iswxdigit ucd_isxdigit + +#endif