sal/osl/unx/memory.cxx | 8 --------
1 file changed, 8 deletions(-)
New commits:
commit b363891397af33f3d3d8e8956d855339c512fa28
Author: Arnaud VERSINI <arnaud.vers...@libreoffice.org>
AuthorDate: Mon Jul 14 19:58:54 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jul 16 17:54:55 2025 +0200
osl : no need to use Android specific code anymore
Change-Id: Iaa134a07864a5d7edeec23ec1d76a36f0c050738
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187870
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sal/osl/unx/memory.cxx b/sal/osl/unx/memory.cxx
index be3e41fb5e8b..a0e702e998fb 100644
--- a/sal/osl/unx/memory.cxx
+++ b/sal/osl/unx/memory.cxx
@@ -10,9 +10,6 @@
#include <oslmemory.h>
#include <stdlib.h>
-#ifdef __ANDROID__
-#include <malloc.h>
-#endif
void* osl_aligned_alloc(sal_Size align, sal_Size size)
{
@@ -20,14 +17,9 @@ void* osl_aligned_alloc(sal_Size align, sal_Size size)
{
return nullptr;
}
-
-#if defined __ANDROID__
- return memalign(align, size);
-#else
void* ptr;
int err = posix_memalign(&ptr, align, size);
return err ? nullptr : ptr;
-#endif
}
void osl_aligned_free(void* p) { free(p); }
