aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-11 00:21:42 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-11 00:21:42 +0000
commitec2c69f0a0e67f8bc3d385e38c5414fa74cdf0ba (patch)
treee5656f9e9a238dbcda7d547529ebfc4ba3e03103 /include/asterisk
parent0406912cf949f4d6886b16c21ef024432b0a9a3c (diff)
issue #5668, modified to compile on non-Cygwin platforms :-)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7061 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-rwxr-xr-xinclude/asterisk/lock.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index 9c2df3487..cea5d06a1 100755
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -36,13 +36,9 @@
#ifdef __APPLE__
/* Provide the Linux initializers for MacOS X */
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
-#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP { 0x4d555458, \
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
- 0x20 } }
-#endif
-
-#ifdef __CYGWIN__
-#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP { 0x4d555458, \
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
+ 0x20 } }
#endif
#ifdef BSD
@@ -55,7 +51,11 @@
/* From now on, Asterisk REQUIRES Recursive (not error checking) mutexes
and will not run without them. */
-#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#if defined(__CYGWIN__)
+#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+#define PTHREAD_MUTEX_INIT_VALUE (ast_mutex_t)18
+#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP
+#elif defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
#define PTHREAD_MUTEX_INIT_VALUE PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP
#else