wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 1204985 - make SharedMemoryBasic_mach build on iOS. r=billm

Browse Source
This commit is contained in:
Ted Mielczarek 2015-09-22 13:59:00 -04:00
parent a5cc6705ef
commit aa4e0c8a5e
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipc/glue/CrossProcessMutex.h
View File

@ -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"

2
ipc/glue/SharedMemoryBasic.h
View File

@ -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"

11
ipc/glue/SharedMemoryBasic_mach.cpp → ipc/glue/SharedMemoryBasic_mach.mm
View File

@ -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"

2
ipc/glue/moz.build
View File

@ -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']