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

[Tor Lillqvist]

 sal/osl/unx/memory.c |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 757856e9275d19e2c7a3673d10fa8963fb9fbeb3
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 28 08:41:57 2014 +0200

    Android does not have posix_memalign()
    
    Change-Id: I4cd2f1e41b3bcab0d87a7b353d63c04b20aad492

diff --git a/sal/osl/unx/memory.c b/sal/osl/unx/memory.c
index a70bc16..2b6c20f 100644
--- a/sal/osl/unx/memory.c
+++ b/sal/osl/unx/memory.c
@@ -10,12 +10,19 @@
 #include <internal/oslmemory.h>
 
 #include <stdlib.h>
+#ifdef __ANDROID__
+#include <malloc.h>
+#endif
 
 void* osl_aligned_alloc( sal_Size align, sal_Size size )
 {
+#ifdef __ANDROID__
+    return memalign(align, size);
+#else
     void* ptr;
     int err = posix_memalign(&ptr, align, size);
     return err ? NULL : ptr;
+#endif
 }
 
 void osl_aligned_free( void* p )