diff options
Diffstat (limited to 'inputmethod/mozc-server/patches/patch-base_mutex.cc')
| -rw-r--r-- | inputmethod/mozc-server/patches/patch-base_mutex.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/inputmethod/mozc-server/patches/patch-base_mutex.cc b/inputmethod/mozc-server/patches/patch-base_mutex.cc index 744bb47e642..ed6c5a790a4 100644 --- a/inputmethod/mozc-server/patches/patch-base_mutex.cc +++ b/inputmethod/mozc-server/patches/patch-base_mutex.cc @@ -1,26 +1,26 @@ -$NetBSD: patch-base_mutex.cc,v 1.3 2013/09/07 18:42:14 ryoon Exp $ +$NetBSD: patch-base_mutex.cc,v 1.4 2016/05/16 11:51:49 ryoon Exp $ ---- base/mutex.cc.orig 2013-08-28 05:26:13.000000000 +0000 +--- base/mutex.cc.orig 2016-05-15 08:11:10.000000000 +0000 +++ base/mutex.cc -@@ -61,7 +61,7 @@ namespace mozc { +@@ -53,7 +53,7 @@ namespace mozc { // Wrapper for Windows InterlockedCompareExchange namespace { --#ifdef OS_LINUX -+#if defined(OS_LINUX) || defined(OS_NETBSD) +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_NETBSD) // Linux doesn't provide InterlockedCompareExchange-like function. inline int InterlockedCompareExchange(volatile int *target, int new_value, -@@ -80,7 +80,7 @@ inline int InterlockedCompareExchange(vo +@@ -72,7 +72,7 @@ inline int InterlockedCompareExchange(vo pthread_mutex_unlock(&lock); return result; } --#endif // OS_LINUX -+#endif // OS_LINUX || OS_NETBSD +-#endif // OS_LINUX || OS_ANDROID || OS_NACL ++#endif // OS_LINUX || OS_ANDROID || OS_NACL || OS_NETBSD // Use OSAtomicCompareAndSwapInt on Mac OSX // http://developer.apple.com/iphone/library/documentation/ -@@ -93,7 +93,7 @@ inline int InterlockedCompareExchange(vo +@@ -85,7 +85,7 @@ inline int InterlockedCompareExchange(vo return OSAtomicCompareAndSwapInt(old_value, new_value, target) ? old_value : *target; } @@ -29,12 +29,12 @@ $NetBSD: patch-base_mutex.cc,v 1.3 2013/09/07 18:42:14 ryoon Exp $ } // namespace -@@ -300,7 +300,7 @@ Mutex::Mutex() { +@@ -183,7 +183,7 @@ Mutex::Mutex() { // PTHREAD_MUTEX_RECURSIVE_NP but Mac OS X 10.5 does not pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_NETBSD) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - #elif defined(OS_LINUX) + #elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_NACL) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); |