[asterisk-commits] russell: branch 1.6.2 r184150 - in /branches/1.6.2: ./ include/asterisk/ utils/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Mar 24 21:02:22 2009
New Revision: 184150

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184150
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/include/asterisk/compat.h
    branches/1.6.2/utils/Makefile

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Tue Mar 24 21:02:22 2009
@@ -1,1 +1,1 @@
-/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183701,183766,183865,183914,184037,184043,184079
+/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183701,183766,183865,183914,184037,184043,184079,184147

Modified: branches/1.6.2/include/asterisk/compat.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/include/asterisk/compat.h?view=diff&rev=184150&r1=184149&r2=184150
==============================================================================
--- branches/1.6.2/include/asterisk/compat.h (original)
+++ branches/1.6.2/include/asterisk/compat.h Tue Mar 24 21:02:22 2009
@@ -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"

Modified: branches/1.6.2/utils/Makefile
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/utils/Makefile?view=diff&rev=184150&r1=184149&r2=184150
==============================================================================
--- branches/1.6.2/utils/Makefile (original)
+++ branches/1.6.2/utils/Makefile Tue Mar 24 21:02:22 2009
@@ -163,6 +163,11 @@
 	$(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.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
-
-hashtest: hashtest.o md5.o hashtab.o utils.o strings.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 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