? asterisk.dll
Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.189
diff -u -r1.189 asterisk.c
--- asterisk.c	1 Nov 2005 21:53:29 -0000	1.189
+++ asterisk.c	2 Nov 2005 07:54:56 -0000
@@ -108,6 +108,7 @@
 #include "asterisk/build.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/devicestate.h"
+#include "asterisk/compat.h"
 
 #include "asterisk/doxyref.h"		/* Doxygen documentation */
 
Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.294
diff -u -r1.294 pbx.c
--- pbx.c	31 Oct 2005 15:34:11 -0000	1.294
+++ pbx.c	2 Nov 2005 07:54:58 -0000
@@ -56,6 +56,7 @@
 #include "asterisk/musiconhold.h"
 #include "asterisk/app.h"
 #include "asterisk/devicestate.h"
+#include "asterisk/compat.h"
 
 /*!
  * \note I M P O R T A N T :
Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.83
diff -u -r1.83 utils.c
--- utils.c	1 Nov 2005 21:53:29 -0000	1.83
+++ utils.c	2 Nov 2005 07:54:59 -0000
@@ -842,7 +842,7 @@
 }
 #endif /* !HAVE_STRTOQ */
 
-#if (!defined(_BSD_SOURCE))
+#ifndef HAVE_GETLOADAVG
 #ifdef linux
 /* Alternative method of getting load avg on Linux only */
 int getloadavg(double *list, int nelem)
Index: codecs/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- codecs/Makefile	1 Nov 2005 21:53:29 -0000	1.33
+++ codecs/Makefile	2 Nov 2005 07:54:59 -0000
@@ -14,6 +14,8 @@
 ifeq (${OSARCH},CYGWIN)
 CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
 CYGSOLIB=-L.. -L. -lasterisk.dll
+else
+CFLAGS+=-fPIC
 endif
 
 ifneq ($(wildcard g723.1/coder.c),)
@@ -57,7 +59,6 @@
   LIBILBC=ilbc/libilbc.a
 endif
 
-CFLAGS+=-fPIC
 
 LIBGSM=gsm/lib/libgsm.a
 LIBGSMT=gsm/lib/libgsm.a
Index: codecs/ilbc/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/ilbc/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- codecs/ilbc/Makefile	5 Mar 2005 21:06:26 -0000	1.9
+++ codecs/ilbc/Makefile	2 Nov 2005 07:54:59 -0000
@@ -1,5 +1,8 @@
 ARCH=$(PROC)
-CFLAGS+=-Wall -fPIC -O3 -funroll-loops
+CFLAGS+=-Wall -O3 -funroll-loops
+ifneq (${OSARCH},CYGWIN)
+CFLAGS += -fPIC
+endif
 LIB=libilbc.a
 
 OBJS= anaFilter.o iCBSearch.o packing.o \
Index: codecs/lpc10/Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- codecs/lpc10/Makefile	27 Mar 2005 22:39:17 -0000	1.15
+++ codecs/lpc10/Makefile	2 Nov 2005 07:54:59 -0000
@@ -22,7 +22,10 @@
 # 
 
 WARNINGS = -Wall -Wno-comment -Wno-error
-CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
+CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS)
+ifneq (${OSARCH},CYGWIN)
+CFLAGS += -fPIC
+endif
 #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
 
 #fix for PPC processors and ALPHA, And UltraSparc too
Index: include/asterisk/compat.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/compat.h,v
retrieving revision 1.4
diff -u -r1.4 compat.h
--- include/asterisk/compat.h	1 Nov 2005 21:53:30 -0000	1.4
+++ include/asterisk/compat.h	2 Nov 2005 07:54:59 -0000
@@ -74,6 +74,10 @@
 #define HAVE_VASPRINTF
 #define HAVE_STRTOQ
 
+#ifdef _BSD_SOURCE
+#define HAVE_GETLOADAVG
+#endif
+
 #ifdef __linux__
 #define HAVE_STRCASESTR
 #define HAVE_STRNDUP
Index: include/asterisk/lock.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/lock.h,v
retrieving revision 1.41
diff -u -r1.41 lock.h
--- include/asterisk/lock.h	1 Nov 2005 21:53:30 -0000	1.41
+++ include/asterisk/lock.h	2 Nov 2005 07:55:00 -0000
@@ -624,7 +624,9 @@
 
 #endif /* !DEBUG_THREADS */
 
+#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
Index: include/asterisk/utils.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/utils.h,v
retrieving revision 1.50
diff -u -r1.50 utils.h
--- include/asterisk/utils.h	1 Nov 2005 20:09:09 -0000	1.50
+++ include/asterisk/utils.h	2 Nov 2005 07:55:00 -0000
@@ -231,4 +231,8 @@
 */
 char *ast_process_quotes_and_slashes(char *start, char find, char replace_with);
 
+#ifndef HAVE_GETLOADAVG
+int getloadavg(double *list, int nelem);
+#endif
+
 #endif /* _ASTERISK_UTILS_H */
Index: stdtime/localtime.c
===================================================================
RCS file: /usr/cvsroot/asterisk/stdtime/localtime.c,v
retrieving revision 1.14
diff -u -r1.14 localtime.c
--- stdtime/localtime.c	1 Nov 2005 22:11:55 -0000	1.14
+++ stdtime/localtime.c	2 Nov 2005 07:55:01 -0000
@@ -79,6 +79,12 @@
 #define OPEN_MODE	O_RDONLY
 #endif /* !defined O_BINARY */
 
+#ifdef SOLARIS
+#undef TM_ZONE
+#undef TM_GMTOFF 
+#endif
+
+#ifdef TM_ZONE
 #ifndef WILDABBR
 /*
 ** Someone might make incorrect use of a time zone abbreviation:
@@ -103,6 +109,7 @@
 #endif /* !defined WILDABBR */
 
 static char		wildabbr[] = "WILDABBR";
+#endif /* TM_ZONE */
 
 /* FreeBSD defines 'zone' in 'struct tm' as non-const, so don't declare this
    string as const. */
@@ -129,12 +136,6 @@
 #ifndef TZNAME_MAX
 #define MY_TZNAME_MAX	255
 #endif /* !defined TZNAME_MAX */
-
-#ifdef SOLARIS
-#undef TM_ZONE
-#undef TM_GMTOFF 
-#endif
-
 
 struct state {
 	char	name[TZ_STRLEN_MAX + 1];