[Asterisk-cvs] asterisk/include/asterisk compat.h, 1.3, 1.4 lock.h, 1.40, 1.41

[kpfleming]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv16806/include/asterisk

Modified Files:
	compat.h lock.h 
Log Message:
issue #4678


Index: compat.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/compat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- compat.h	24 Oct 2005 20:12:06 -0000	1.3
+++ compat.h	1 Nov 2005 21:53:30 -0000	1.4
@@ -63,8 +63,12 @@
 
 #ifdef __CYGWIN__
 #define _WIN32_WINNT 0x0500
-#include <windows.h>
-#include <w32api/ws2tcpip.h>
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN  16
+#endif
+#ifndef INET6_ADDRSTRLEN
+#define INET6_ADDRSTRLEN 46
+#endif
 #endif /* __CYGWIN__ */
 
 #define HAVE_VASPRINTF

Index: lock.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/lock.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- lock.h	28 Oct 2005 16:59:48 -0000	1.40
+++ lock.h	1 Nov 2005 21:53:30 -0000	1.41
@@ -41,6 +41,10 @@
 														 0x20 } }
 #endif
 
+#ifdef __CYGWIN__
+#define PTHREAD_MUTEX_RECURSIVE_NP					PTHREAD_MUTEX_RECURSIVE
+#endif
+
 #ifdef BSD
 #ifdef __GNUC__
 #define AST_MUTEX_INIT_W_CONSTRUCTORS