diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-25 01:48:17 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-25 01:48:17 +0000 |
commit | 0519227e4d016eaacdc2c387f9a1d002d6eff5c3 (patch) | |
tree | d79507280d51a3d3dd989990088957e63b8fffad | |
parent | 91210c7b9dc322ed12b4ce781436a04983bce7e8 (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.0@184148 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | include/asterisk/compat.h | 2 | ||||
-rw-r--r-- | utils/Makefile | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index 41e5a6b8f..d828b5270 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 8a37e9946..8c831cd5e 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -143,6 +143,10 @@ aelparse.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res -DSTANDALONE -Wno-unused 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 +poll.c: $(ASTTOPDIR)/main/poll.c + @cp "$<" "$@" +poll.o: ASTCFLAGS+=-DSTANDALONE + astobj2.c: $(ASTTOPDIR)/main/astobj2.c @cp "$<" "$@" astobj2.o: ASTCFLAGS+=-DSTANDALONE @@ -160,9 +164,9 @@ threadstorage.c: $(ASTTOPDIR)/main/threadstorage.c threadstorage.o: ASTCFLAGS+=-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 extconf.o: extconf.c |