aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-25 01:55:16 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-25 01:55:16 +0000
commita9e01d8f63ed999cc88f60208a8c7c3af60b1cb4 (patch)
tree5d4c52193ed3ec59409535292fb960a7ec01e461 /main
parentc59d8265ee20c3de2f72e1f1beaa9140abbd5ef4 (diff)
Merged revisions 184147 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r184147 | russell | 2009-03-24 20:42:10 -0500 (Tue, 24 Mar 2009) | 5 lines Fix build issues on Mac OSX. (closes issue #14714) Reported by: ygor ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@184149 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/timing.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/timing.c b/main/timing.c
index fbc2f21d8..c24db2e29 100644
--- a/main/timing.c
+++ b/main/timing.c
@@ -38,6 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/time.h"
#include "asterisk/heap.h"
#include "asterisk/module.h"
+#include "asterisk/poll-compat.h"
struct timing_holder {
/*! Do _not_ move this from the beginning of the struct. */
@@ -290,7 +291,7 @@ static char *timing_test(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
.events = POLLIN | POLLPRI,
};
- res = poll(&pfd, 1, 100);
+ res = ast_poll(&pfd, 1, 100);
if (res == 1) {
count++;