[Libreoffice-commits] core.git: bridges/source

[Tor Lillqvist]

 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad0e0cb25c7943663f6c946fd300bff83e4caa59
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 5 07:27:05 2017 +0300

    Fix --enable-assert-always-abort (but not --enable-debug) build
    
    Look at NDEBUG, not OSL_DEBUG_LEVEL, to see whether asserts are active
    or not.
    
    Change-Id: I772d27da4bcc73c8c5a50ab4b72f50caddcf7273

diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index b340c08b1a6a..3b7beeac3102 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -109,7 +109,7 @@ static typelib_TypeClass cpp2uno_call(
 
         int nUsedGPR = 0;
         int nUsedSSE = 0;
-#if OSL_DEBUG_LEVEL > 0
+#ifndef NDEBUG
         bool bFitsRegisters =
 #endif
             x86_64::examine_argument( rParam.pTypeRef, false, nUsedGPR, nUsedSSE );