[Libreoffice-commits] core.git: sal/rtl

[Christian Lohmaier]

 sal/rtl/string.cxx  |    2 +-
 sal/rtl/ustring.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d6e7c247563cb15dcc143f6d1d583c746af0184b
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Dec 19 20:56:15 2014 +0100

    constants via #define must be integer if used in #if statement
    
    breaks windows build otherwise (fatal erro C1017)
    
    Change-Id: Idae78c621bfb8f989eb33220f015e17a7b7fb92f

diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx
index 259906c..07842ec 100644
--- a/sal/rtl/string.cxx
+++ b/sal/rtl/string.cxx
@@ -56,7 +56,7 @@ static rtl_String const aImplEmpty_rtl_String =
  * ustring.cxx
  */
 
-#define IMPL_RTL_IS_USTRING         false
+#define IMPL_RTL_IS_USTRING         0
 
 #define IMPL_RTL_STRCODE            sal_Char
 #define IMPL_RTL_USTRCODE( c )      ((unsigned char)c)
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index 0fc9e06..a9406d8 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -62,7 +62,7 @@ static rtl_uString const aImplEmpty_rtl_uString =
  * string.cxx
  */
 
-#define IMPL_RTL_IS_USTRING         true
+#define IMPL_RTL_IS_USTRING         1
 
 #define IMPL_RTL_STRCODE            sal_Unicode
 #define IMPL_RTL_USTRCODE( c )      (c)