mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 05:11:16 +00:00
bug 1204985 - make SharedMemoryBasic_mach build on iOS. r=billm
--HG-- rename : ipc/glue/SharedMemoryBasic_mach.cpp => ipc/glue/SharedMemoryBasic_mach.mm extra : commitid : LQkdXR8Jccx extra : rebase_source : b16238102bba8173126299f5d225f5ac24f047b8
This commit is contained in:
parent
76da157ae2
commit
edc3c41143
@ -9,7 +9,7 @@
|
||||
#include "base/process.h"
|
||||
#include "mozilla/Mutex.h"
|
||||
|
||||
#if defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
#if defined(OS_LINUX) || defined(XP_DARWIN)
|
||||
#include <pthread.h>
|
||||
#include "SharedMemoryBasic.h"
|
||||
#include "mozilla/Atomics.h"
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
#ifdef ANDROID
|
||||
# include "mozilla/ipc/SharedMemoryBasic_android.h"
|
||||
#elif defined(XP_MACOSX)
|
||||
#elif defined(XP_DARWIN)
|
||||
# include "mozilla/ipc/SharedMemoryBasic_mach.h"
|
||||
#else
|
||||
# include "mozilla/ipc/SharedMemoryBasic_chromium.h"
|
||||
|
@ -9,7 +9,18 @@
|
||||
|
||||
#include <mach/vm_map.h>
|
||||
#include <mach/mach_port.h>
|
||||
#if defined(XP_IOS)
|
||||
#include <mach/vm_map.h>
|
||||
#define mach_vm_address_t vm_address_t
|
||||
#define mach_vm_allocate vm_allocate
|
||||
#define mach_vm_deallocate vm_deallocate
|
||||
#define mach_vm_map vm_map
|
||||
#define mach_vm_read vm_read
|
||||
#define mach_vm_region_recurse vm_region_recurse_64
|
||||
#define mach_vm_size_t vm_size_t
|
||||
#else
|
||||
#include <mach/mach_vm.h>
|
||||
#endif
|
||||
#include <pthread.h>
|
||||
#include <unistd.h>
|
||||
#include "SharedMemoryBasic.h"
|
@ -80,7 +80,7 @@ if CONFIG['OS_TARGET'] == 'Android':
|
||||
elif CONFIG['OS_ARCH'] == 'Darwin':
|
||||
EXPORTS.mozilla.ipc += ['SharedMemoryBasic_mach.h']
|
||||
SOURCES += [
|
||||
'SharedMemoryBasic_mach.cpp',
|
||||
'SharedMemoryBasic_mach.mm',
|
||||
]
|
||||
else:
|
||||
EXPORTS.mozilla.ipc += ['SharedMemoryBasic_chromium.h']
|
||||
|
Loading…
Reference in New Issue
Block a user