[asterisk-commits] rizzo: branch rizzo/cygwin_build r87948 - in /team/rizzo/cygwin_build: ./ inc...

[SVN commits to the Asterisk project]

Author: rizzo
Date: Wed Oct 31 17:49:42 2007
New Revision: 87948

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

Modified:
    team/rizzo/cygwin_build/Makefile
    team/rizzo/cygwin_build/include/asterisk/lock.h
    team/rizzo/cygwin_build/main/astobj2.c

Modified: team/rizzo/cygwin_build/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/cygwin_build/Makefile?view=diff&rev=87948&r1=87947&r2=87948
==============================================================================
--- team/rizzo/cygwin_build/Makefile (original)
+++ team/rizzo/cygwin_build/Makefile Wed Oct 31 17:49:42 2007
@@ -284,6 +284,10 @@
 
 ifeq ($(OSARCH),SunOS)
   SOLINK=-shared -fpic -L/usr/local/ssl/lib
+endif
+
+ifeq ($(OSARCH),cygwin)
+  SOLINK=-Xlinker -r
 endif
 
 # This is used when generating the doxygen documentation

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=87948&r1=87947&r2=87948
==============================================================================
--- team/rizzo/cygwin_build/include/asterisk/lock.h (original)
+++ team/rizzo/cygwin_build/include/asterisk/lock.h Wed Oct 31 17:49:42 2007
@@ -80,7 +80,7 @@
 
 /* Asterisk REQUIRES recursive (not error checking) mutexes
    and will not run without them. */
-#if defined(PTHREAD_RECURSIVE_MUTEX_RECURSIVE_NP)
+#if defined(PTHREAD_MUTEX_RECURSIVE_NP)
 #define PTHREAD_MUTEX_INIT_VALUE	PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
 #define AST_MUTEX_KIND			PTHREAD_MUTEX_RECURSIVE_NP
 #else
@@ -796,7 +796,9 @@
 #define pthread_mutex_trylock use_ast_mutex_trylock_instead_of_pthread_mutex_trylock
 #define pthread_mutex_init use_ast_mutex_init_instead_of_pthread_mutex_init
 #define pthread_mutex_destroy use_ast_mutex_destroy_instead_of_pthread_mutex_destroy
+#ifndef __CYGWIN__
 #define pthread_cond_t use_ast_cond_t_instead_of_pthread_cond_t
+#endif
 #define pthread_cond_init use_ast_cond_init_instead_of_pthread_cond_init
 #define pthread_cond_destroy use_ast_cond_destroy_instead_of_pthread_cond_destroy
 #define pthread_cond_signal use_ast_cond_signal_instead_of_pthread_cond_signal

Modified: team/rizzo/cygwin_build/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/cygwin_build/main/astobj2.c?view=diff&rev=87948&r1=87947&r2=87948
==============================================================================
--- team/rizzo/cygwin_build/main/astobj2.c (original)
+++ team/rizzo/cygwin_build/main/astobj2.c Wed Oct 31 17:49:42 2007
@@ -111,7 +111,7 @@
 
 	p = (struct astobj2 *) ((char *) user_data - sizeof(*p));
 	if (AO2_MAGIC != (p->priv_data.magic) ) {
-		ast_log(LOG_ERROR, "bad magic number 0x%lx for %p\n", p->priv_data.magic, p);
+		ast_log(LOG_ERROR, "bad magic number 0x%x for %p\n", (unsigned)p->priv_data.magic, p);
 		p = NULL;
 	}