diff options
| -rwxr-xr-x | ChangeLog | 2 | ||||
| -rwxr-xr-x | include/asterisk/lock.h | 16 |
2 files changed, 10 insertions, 8 deletions
@@ -1,5 +1,7 @@ 2005-11-10 Kevin P. Fleming <kpfleming@digium.com> + * include/asterisk/lock.h (PTHREAD_MUTEX_RECURSIVE_NP): work around header problems on Cygwin (issue #5668) + * pbx/pbx_ael.c: handle switch default cases inside macros properly (issue #5354) * configs/voicemail.conf.sample (format): add strong warning about changing format list when mailboxes contain messages (issue #5689) 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 |