? CygwinAdditionalFilesRev4.patch.txt
? include/asterisk/compat.h
Index: strcompat.c
===================================================================
RCS file: /usr/cvsroot/asterisk/strcompat.c,v
retrieving revision 1.4
diff -u -r1.4 strcompat.c
--- strcompat.c	20 Jul 2005 00:13:14 -0000	1.4
+++ strcompat.c	7 Sep 2005 05:14:24 -0000
@@ -3,9 +3,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#endif
+#include "asterisk/compat.h"
 
 char* strsep(char** str, const char* delims)
 {
Index: agi/eagi-sphinx-test.c
===================================================================
RCS file: /usr/cvsroot/asterisk/agi/eagi-sphinx-test.c,v
retrieving revision 1.4
diff -u -r1.4 eagi-sphinx-test.c
--- agi/eagi-sphinx-test.c	14 Dec 2004 23:36:29 -0000	1.4
+++ agi/eagi-sphinx-test.c	7 Sep 2005 05:14:24 -0000
@@ -17,9 +17,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#ifdef SOLARIS
-#include <solaris-compat/compat.h>
-#endif
+#include <asterisk/compat.h>
 
 #define AUDIO_FILENO (STDERR_FILENO + 1)
 
Index: agi/eagi-test.c
===================================================================
RCS file: /usr/cvsroot/asterisk/agi/eagi-test.c,v
retrieving revision 1.3
diff -u -r1.3 eagi-test.c
--- agi/eagi-test.c	14 Dec 2004 23:36:29 -0000	1.3
+++ agi/eagi-test.c	7 Sep 2005 05:14:24 -0000
@@ -11,9 +11,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/select.h>
-#ifdef SOLARIS
-#include <solaris-compat/compat.h>
-#endif
+#include <asterisk/compat.h>
 
 #define AUDIO_FILENO (STDERR_FILENO + 1)
 
Index: db1-ast/hash/hash.c
===================================================================
RCS file: /usr/cvsroot/asterisk/db1-ast/hash/hash.c,v
retrieving revision 1.2
diff -u -r1.2 hash.c
--- db1-ast/hash/hash.c	17 Mar 2005 23:12:15 -0000	1.2
+++ db1-ast/hash/hash.c	7 Sep 2005 05:14:25 -0000
@@ -51,9 +51,7 @@
 #include <assert.h>
 #endif
 
-#ifdef SOLARIS
-#include <solaris-compat/compat.h>
-#endif
+#include <asterisk/compat.h>
 
 #include <db.h>
 #include "hash.h"
Index: include/asterisk/channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.99
diff -u -r1.99 channel.h
--- include/asterisk/channel.h	1 Sep 2005 00:10:49 -0000	1.99
+++ include/asterisk/channel.h	7 Sep 2005 05:14:26 -0000
@@ -23,9 +23,7 @@
 #ifndef _ASTERISK_CHANNEL_H
 #define _ASTERISK_CHANNEL_H
 
-#ifdef SOLARIS
-#include <solaris-compat/compat.h>
-#endif
+#include "asterisk/compat.h"
 #include "asterisk/frame.h"
 #include "asterisk/sched.h"
 #include "asterisk/chanvars.h"
Index: include/asterisk/endian.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/endian.h,v
retrieving revision 1.4
diff -u -r1.4 endian.h
--- include/asterisk/endian.h	30 Aug 2005 18:32:09 -0000	1.4
+++ include/asterisk/endian.h	7 Sep 2005 05:14:26 -0000
@@ -27,9 +27,7 @@
  * Autodetect system endianess
  */
 
-#ifdef SOLARIS
-#include "solaris-compat/compat.h"
-#endif
+#include "asterisk/compat.h"
 
 #ifndef __BYTE_ORDER
 #ifdef __linux__
Index: include/asterisk/logger.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/logger.h,v
retrieving revision 1.14
diff -u -r1.14 logger.h
--- include/asterisk/logger.h	30 Aug 2005 18:32:09 -0000	1.14
+++ include/asterisk/logger.h	7 Sep 2005 05:14:26 -0000
@@ -25,9 +25,7 @@
 #ifndef _ASTERISK_LOGGER_H
 #define _ASTERISK_LOGGER_H
 
-#ifdef SOLARIS
-#include <solaris-compat/compat.h>
-#endif
+#include "asterisk/compat.h"
 
 #include <stdarg.h>
 
Index: include/asterisk/strings.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/strings.h,v
retrieving revision 1.8
diff -u -r1.8 strings.h
--- include/asterisk/strings.h	30 Aug 2005 18:32:10 -0000	1.8
+++ include/asterisk/strings.h	7 Sep 2005 05:14:26 -0000
@@ -28,6 +28,7 @@
 
 #include "asterisk/inline_api.h"
 #include "asterisk/compiler.h"
+#include "asterisk/compat.h"
 
 static inline int ast_strlen_zero(const char *s)
 {
@@ -208,44 +209,5 @@
 		} \
 		(ra)->ptr; \
 	})
-
-#define HAVE_VASPRINTF
-#define HAVE_STRTOQ
-
-#ifdef __linux__
-#define HAVE_STRCASESTR
-#define HAVE_STRNDUP
-#define HAVE_STRNLEN
-#endif
-
-#ifdef SOLARIS
-#undef HAVE_VASPRINTF
-#undef HAVE_STRTOQ
-#endif
-
-#ifdef __CYGWIN__
-#undef HAVE_STRTOQ
-typedef unsigned long long uint64_t;
-#endif
-
-#ifndef HAVE_STRCASESTR
-char *strcasestr(const char *, const char *);
-#endif
-
-#ifndef HAVE_STRNDUP
-char *strndup(const char *, size_t);
-#endif
-
-#ifndef HAVE_STRNLEN
-size_t strnlen(const char *, size_t);
-#endif
-
-#ifndef HAVE_VASPRINTF
-int vasprintf(char **strp, const char *fmt, va_list ap);
-#endif
-
-#ifndef HAVE_STRTOQ
-uint64_t strtoq(const char *nptr, char **endptr, int base);
-#endif
 
 #endif /* _ASTERISK_STRINGS_H */
Index: include/asterisk/utils.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/utils.h,v
retrieving revision 1.42
diff -u -r1.42 utils.h
--- include/asterisk/utils.h	30 Aug 2005 18:32:10 -0000	1.42
+++ include/asterisk/utils.h	7 Sep 2005 05:14:26 -0000
@@ -23,9 +23,7 @@
 #ifndef _ASTERISK_UTILS_H
 #define _ASTERISK_UTILS_H
 
-#ifdef SOLARIS
-#include <solaris-compat/compat.h>
-#endif
+#include "asterisk/compat.h"
 
 #include <netinet/in.h>
 #include <arpa/inet.h>	/* we want to override inet_ntoa */
Index: utils/smsq.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils/smsq.c,v
retrieving revision 1.7
diff -u -r1.7 smsq.c
--- utils/smsq.c	15 May 2005 03:32:20 -0000	1.7
+++ utils/smsq.c	7 Sep 2005 05:14:27 -0000
@@ -9,8 +9,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
+#include <asterisk/compat.h>
 #ifdef SOLARIS
-#include <solaris-compat/compat.h>
 #define     POPT_ARGFLAG_SHOW_DEFAULT 0x00800000
 #endif
 #if !defined(POPT_ARGFLAG_SHOW_DEFAULT)