kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-11 20:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 184147 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@184149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-03-25 01:55:16 +00:00
parent cf35e2ded1
commit 02dc79b54e
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/compat.h
View File

@@ -67,7 +67,7 @@
#include <string.h> #include <string.h>
#endif #endif
#ifdef HAVE_SYS_POLL_H #ifndef AST_POLL_COMPAT
#include <sys/poll.h> #include <sys/poll.h>
#else #else
#include "asterisk/poll-compat.h" #include "asterisk/poll-compat.h"

3
main/timing.c
View File

@@ -38,6 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/time.h" #include "asterisk/time.h"
#include "asterisk/heap.h" #include "asterisk/heap.h"
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/poll-compat.h"
struct timing_holder { struct timing_holder {
/*! Do _not_ move this from the beginning of the struct. */ /*! 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, .events = POLLIN | POLLPRI,
}; };
res = poll(&pfd, 1, 100); res = ast_poll(&pfd, 1, 100);
if (res == 1) { if (res == 1) {
count++; count++;

10
utils/Makefile
View File

@@ -143,6 +143,10 @@ aelparse.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res -DSTANDALONE -Wno-unused
aelparse: LIBS+=-lm aelparse: LIBS+=-lm
aelparse: aelparse.o aelbison.o pbx_ael.o hashtab.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o aelparse: aelparse.o aelbison.o pbx_ael.o hashtab.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o
poll.c: $(ASTTOPDIR)/main/poll.c
@cp "$<" "$@"
poll.o: ASTCFLAGS+=-DSTANDALONE
astobj2.c: $(ASTTOPDIR)/main/astobj2.c astobj2.c: $(ASTTOPDIR)/main/astobj2.c
@cp "$<" "$@" @cp "$<" "$@"
astobj2.o: ASTCFLAGS+=-DSTANDALONE astobj2.o: ASTCFLAGS+=-DSTANDALONE
@@ -160,12 +164,12 @@ threadstorage.c: $(ASTTOPDIR)/main/threadstorage.c
threadstorage.o: ASTCFLAGS+=-DSTANDALONE threadstorage.o: ASTCFLAGS+=-DSTANDALONE
hashtest2.o: ASTCFLAGS+=-O0 -DSTANDALONE hashtest2.o: ASTCFLAGS+=-O0 -DSTANDALONE
hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
hashtest: hashtest.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o hashtest: hashtest.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
hashtest.o: ASTCFLAGS+=-O0 -DSTANDALONE hashtest.o: ASTCFLAGS+=-O0 -DSTANDALONE
refcounter: refcounter.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o refcounter: refcounter.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
refcounter.o: ASTCFLAGS+=-O0 -DSTANDALONE refcounter.o: ASTCFLAGS+=-O0 -DSTANDALONE
extconf.o: extconf.c extconf.o: extconf.c