diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-25 01:42:10 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-25 01:42:10 +0000 |
commit | 4d91abde1f436499f83717528005cbbfa6dbee58 (patch) | |
tree | dbe1515e4559fb1615977759bcb3e86a342d5e29 | |
parent | 3fe3adf8b0bfc911c4ef428973cc894f9961a59d (diff) |
Fix build issues on Mac OSX.
(closes issue #14714)
Reported by: ygor
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@184147 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | include/asterisk/compat.h | 2 | ||||
-rw-r--r-- | utils/Makefile | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index 572bb145b..519c71e68 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -67,7 +67,7 @@ #include <string.h> #endif -#ifdef HAVE_SYS_POLL_H +#ifndef AST_POLL_COMPAT #include <sys/poll.h> #else #include "asterisk/poll-compat.h" diff --git a/utils/Makefile b/utils/Makefile index c9acb26e7..70fe13c1b 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -163,6 +163,11 @@ utils.c: $(ASTTOPDIR)/main/utils.c $(CMD_PREFIX) cp "$<" "$@" utils.o: ASTCFLAGS+=-DSTANDALONE +poll.c: $(ASTTOPDIR)/main/poll.c + $(ECHO_PREFIX) echo " [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@" + $(CMD_PREFIX) cp "$<" "$@" +poll.o: ASTCFLAGS+=-DSTANDALONE + strings.c: $(ASTTOPDIR)/main/strings.c $(ECHO_PREFIX) echo " [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@" $(CMD_PREFIX) cp "$<" "$@" @@ -179,12 +184,12 @@ threadstorage.c: $(ASTTOPDIR)/main/threadstorage.c threadstorage.o: ASTCFLAGS+=-DSTANDALONE hashtest2.o: ASTCFLAGS+=-O0 -DSTANDALONE -hashtest2: hashtest2.o md5.o utils.o strings.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o +hashtest2: hashtest2.o md5.o utils.o strings.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o -hashtest: hashtest.o md5.o hashtab.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o +hashtest: hashtest.o md5.o hashtab.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o hashtest.o: ASTCFLAGS+=-O0 -DSTANDALONE -refcounter: refcounter.o md5.o hashtab.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o +refcounter: refcounter.o md5.o hashtab.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o refcounter.o: ASTCFLAGS+=-O0 -DSTANDALONE extconf.o: extconf.c |