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

Tor Lillqvist tml at collabora.com
Tue Apr 1 09:19:01 PDT 2014


 sal/osl/unx/memory.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81ad1147360d9a3ff339671ebe15acde8a6b7c67
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 1 19:17:07 2014 +0300

    WaE: 'MAC_OS_X_VERSION_MAX_ALLOWED' is not defined, evaluates to 0
    
    (When compiling for iOS.)
    
    Change-Id: I9f9f5b122c1bfac4ff670a4302fb10b6b82685ac

diff --git a/sal/osl/unx/memory.c b/sal/osl/unx/memory.c
index bde2fac..f31c28c 100644
--- a/sal/osl/unx/memory.c
+++ b/sal/osl/unx/memory.c
@@ -41,7 +41,7 @@ void* osl_aligned_alloc( sal_Size align, sal_Size size )
 
 void osl_aligned_free( void* p )
 {
-#if defined __APPLE__ && MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#if defined MAC_OS_X_VERSION_MAX_ALLOWED && MAC_OS_X_VERSION_MAX_ALLOWED < 1060
     free(((void**)p)[-1]);
 #else
     free(p);


More information about the Libreoffice-commits mailing list