Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv15988
Modified Files:
ChangeLog asterisk.c pbx.c utils.c
Log Message:
issue #5569 minus lock.h changes
Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- ChangeLog 8 Nov 2005 03:54:04 -0000 1.66
+++ ChangeLog 8 Nov 2005 04:13:18 -0000 1.67
@@ -1,5 +1,7 @@
2005-11-07 Kevin P. Fleming <[EMAIL PROTECTED]>
+ * many files: more Cygwin compatibility, and proper getloadavg()
prototype/macro (issue #5569)
+
* include/asterisk/lock.h (__ast_pthread_mutex_lock): correct build
with DETECT_DEADLOCKS defined (issue #5570)
2005-11-07 Russell Bryant <[EMAIL PROTECTED]>
Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- asterisk.c 8 Nov 2005 03:24:31 -0000 1.194
+++ asterisk.c 8 Nov 2005 04:13:18 -0000 1.195
@@ -107,6 +107,7 @@
#include "asterisk/version.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.297
retrieving revision 1.298
diff -u -d -r1.297 -r1.298
--- pbx.c 8 Nov 2005 01:50:35 -0000 1.297
+++ pbx.c 8 Nov 2005 04:13:18 -0000 1.298
@@ -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
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- utils.c 1 Nov 2005 21:53:29 -0000 1.83
+++ utils.c 8 Nov 2005 04:13:18 -0000 1.84
@@ -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)
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
