include/cppu/unotype.hxx | 4 ++-- include/rtl/ustrbuf.hxx | 2 +- include/sal/types.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit f9bf486e25bcec4831393b6dd78ea358ff981b38 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Mar 24 16:35:32 2017 +0100 Better check for 'defined LIBO_INTERNAL_ONLY' (to avoid warnings about undefined macros in external code) Change-Id: Ie1007207b22c19a3d9d96f0f94070c32d417595a diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx index 40708129ae6f..904621fc6756 100644 --- a/include/cppu/unotype.hxx +++ b/include/cppu/unotype.hxx @@ -149,7 +149,7 @@ cppu_detail_getUnoType( ::typelib_TypeClass_UNSIGNED_SHORT); } -#if LIBO_INTERNAL_ONLY +#if defined LIBO_INTERNAL_ONLY // cf. sal/types.h sal_Unicode inline css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_uInt16 const *) { @@ -194,7 +194,7 @@ cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::cppu::UnoCharType const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_CHAR); } -#if LIBO_INTERNAL_ONLY +#if defined LIBO_INTERNAL_ONLY // cf. sal/types.h sal_Unicode inline css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_Unicode const *) { diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx index 32ce9cabe269..1a39bd3fe19f 100644 --- a/include/rtl/ustrbuf.hxx +++ b/include/rtl/ustrbuf.hxx @@ -779,7 +779,7 @@ public: return append( &c, 1 ); } -#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __clang__) +#if defined LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __clang__) // cf. sal/types.h sal_Unicode void append(sal_uInt16) = delete; #endif diff --git a/include/sal/types.h b/include/sal/types.h index 6616670fcb01..93953753ae25 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -136,7 +136,7 @@ typedef unsigned char sal_uChar; typedef wchar_t sal_Unicode; #else #define SAL_UNICODE_NOTEQUAL_WCHAR_T -#if LIBO_INTERNAL_ONLY && defined __cplusplus +#if defined LIBO_INTERNAL_ONLY && defined __cplusplus typedef char16_t sal_Unicode; #else typedef sal_uInt16 sal_Unicode; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits