[svn-commits] rizzo: branch rizzo/cygwin_build r87947 - /team/rizzo/cygwin_build/include/as...

[SVN commits to the Digium repositories]

Author: rizzo
Date: Wed Oct 31 16:49:30 2007
New Revision: 87947

URL: http://svn.digium.com/view/asterisk?view=rev&rev=87947
Log:
more cygwin fixes

Modified:
    team/rizzo/cygwin_build/include/asterisk/lock.h

Modified: team/rizzo/cygwin_build/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/team/rizzo/cygwin_build/include/asterisk/lock.h?view=diff&rev=87947&r1=87946&r2=87947
==============================================================================
--- team/rizzo/cygwin_build/include/asterisk/lock.h (original)
+++ team/rizzo/cygwin_build/include/asterisk/lock.h Wed Oct 31 16:49:30 2007
@@ -80,7 +80,7 @@
 
 /* Asterisk REQUIRES recursive (not error checking) mutexes
    and will not run without them. */
-#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+#if defined(PTHREAD_RECURSIVE_MUTEX_RECURSIVE_NP)
 #define PTHREAD_MUTEX_INIT_VALUE	PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
 #define AST_MUTEX_KIND			PTHREAD_MUTEX_RECURSIVE_NP
 #else
@@ -787,7 +787,10 @@
 	scope ast_mutex_t mutex = init_val
 #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
 
+#ifndef __CYGWIN__
 #define pthread_mutex_t use_ast_mutex_t_instead_of_pthread_mutex_t
+#endif
+
 #define pthread_mutex_lock use_ast_mutex_lock_instead_of_pthread_mutex_lock
 #define pthread_mutex_unlock use_ast_mutex_unlock_instead_of_pthread_mutex_unlock
 #define pthread_mutex_trylock use_ast_mutex_trylock_instead_of_pthread_mutex_trylock