ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Adapt to true wchar_t in clang-cl

Browse Source 
Change-Id: I14c2dc0be12151b5d4ea2ba3b65030f6f4494905
This commit is contained in:
Stephan Bergmann
2015-11-28 08:44:52 +01:00
parent 9c49ece604
commit 0475ab7208
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/cppu/unotype.hxx
+4 -2
View File
@@ -149,7 +149,8 @@ cppu_detail_getUnoType(
::typelib_TypeClass_UNSIGNED_SHORT);
}
#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __MINGW32__)
#if LIBO_INTERNAL_ONLY \
&& (!defined SAL_W32 || defined __MINGW32__ || defined __clang__)
// cf. sal/types.h sal_Unicode
inline css::uno::Type const &
cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_uInt16 const *) {
@@ -194,7 +195,8 @@ cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::cppu::UnoCharType const *) {
return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_CHAR);
}
#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __MINGW32__)
#if LIBO_INTERNAL_ONLY \
&& (!defined SAL_W32 || defined __MINGW32__ || defined __clang__)
// cf. sal/types.h sal_Unicode
inline css::uno::Type const &
cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_Unicode const *) {