[Libreoffice-commits] core.git: 2 commits - solenv/inc svtools/source

[Tor Lillqvist]

 solenv/inc/premac.h                        |    2 +-
 svtools/source/table/tablecontrol_impl.cxx |    6 +++---
 svtools/source/table/tablecontrol_impl.hxx |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 61d95972ffb4cdb72e6edea082db100c5ffdb7a7
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Mar 20 22:34:56 2013 +0200

    WaE: 'DBG_UTIL' is not defined, evaluates to 0
    
    Change-Id: Ib902f3f4b428d5c23347a31773011ddf74f28e99

diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 7e4e5cd..5904805 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -233,7 +233,7 @@ namespace svt { namespace table
     //====================================================================
     DBG_NAME( TableControl_Impl )
 
-#if DBG_UTIL
+#ifdef DBG_UTIL
     //====================================================================
     //= SuspendInvariants
     //====================================================================
@@ -263,7 +263,7 @@ namespace svt { namespace table
     #define DBG_SUSPEND_INV( flags )
 #endif
 
-#if DBG_UTIL
+#ifdef DBG_UTIL
     //====================================================================
     const char* TableControl_Impl_checkInvariants( const void* _pInstance )
     {
@@ -448,7 +448,7 @@ namespace svt { namespace table
         ,m_nAnchor              ( -1                            )
         ,m_bUpdatingColWidths   ( false                         )
         ,m_pAccessibleTable     ( NULL                          )
-#if DBG_UTIL
+#ifdef DBG_UTIL
         ,m_nRequiredInvariants ( INV_SCROLL_POSITION )
 #endif
     {
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 8018d0c..21b43ae 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -147,7 +147,7 @@ namespace svt { namespace table
         AccessibleFactoryAccess     m_aFactoryAccess;
         IAccessibleTableControl*    m_pAccessibleTable;
 
-#if DBG_UTIL
+#ifdef DBG_UTIL
     #define INV_SCROLL_POSITION     1
         /** represents a bitmask of invariants to check
 
@@ -178,7 +178,7 @@ namespace svt { namespace table
         TableControl_Impl( TableControl& _rAntiImpl );
         ~TableControl_Impl();
 
-#if DBG_UTIL
+#ifdef DBG_UTIL
         const sal_Char* impl_checkInvariants() const;
 #endif
         /** to be called when the anti-impl instance has been resized
commit 88739efc126b2191070ab408cbed068100798da0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Mar 20 22:33:34 2013 +0200

    WaE: 'MACOSX_SDK_VERSION' is not defined, evaluates to 0
    
    Change-Id: I6bc1e3ae56d936f6ef28e9d067360ac364e7af5e

diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
index 5dc085c..f4993f9 100644
--- a/solenv/inc/premac.h
+++ b/solenv/inc/premac.h
@@ -56,7 +56,7 @@ typedef int NSColorRenderingIntent;
 #endif
 #endif
 
-#if MACOSX_SDK_VERSION < 1050
+#if defined(MACOSX_SDK_VERSION) && MACOSX_SDK_VERSION < 1050
 typedef float CGFloat;
 typedef int NSInteger;
 typedef unsigned NSUInteger;