From a998eeb0ed9e9920ddbbbb9516d5d967488f3348 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Sun, 19 Jun 2016 16:08:33 -0700 Subject: [PATCH] Android: Android's standalone toolchain now includes a 'sys/shm.h' header file but does not the old-style shared memory segments. Our Android port uses memory mapped files anyway, so just skip over it and get on with life. --- lib/shmem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/shmem.cpp b/lib/shmem.cpp index ea88e889e9..19d63cd486 100644 --- a/lib/shmem.cpp +++ b/lib/shmem.cpp @@ -395,7 +395,7 @@ int detach_shmem_mmap(void* p, size_t size) { return munmap((char *)p, size); } -#if HAVE_SYS_SHM_H +#if HAVE_SYS_SHM_H && !defined(ANDROID) // Compatibility routines for Unix/Linux/Mac V5 applications //