[svn-commits] branch group/autoconf_and_menuselect r20259 - in /team/group/autoconf_and_men...

[svn-commits at lists.digium.com]

Author: russell
Date: Fri Apr 14 23:38:07 2006
New Revision: 20259

URL: http://svn.digium.com/view/asterisk?rev=20259&view=rev
Log:
fix a build issue on mac

Modified:
    team/group/autoconf_and_menuselect/db1-ast/Makefile
    team/group/autoconf_and_menuselect/db1-ast/hash/hash.c

Modified: team/group/autoconf_and_menuselect/db1-ast/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/db1-ast/Makefile?rev=20259&r1=20258&r2=20259&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/db1-ast/Makefile (original)
+++ team/group/autoconf_and_menuselect/db1-ast/Makefile Fri Apr 14 23:38:07 2006
@@ -11,6 +11,10 @@
 ifeq ($(ARCH),sparc64)
 PROC=ultrasparc
 CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+endif
+
+ifeq ($(OSARCH),Darwin)
+  OSARCH_DEFINE+=-D__Darwin__
 endif
 
 LIBDBSO=libdb.so.$(SOVER)
@@ -58,7 +62,7 @@
 db_dump185.o: db_dump185.c
 	$(CL) -o $@ $<
 %.o: hash/%.c
-	$(CL) -Ihash -o $@ $<
+	$(CL) -Ihash $(OSARCH_DEFINE) -o $@ $<
 %.os: hash/%.c
 	$(CL) -Ihash -fPIC -o $@ $<
 %.o: btree/%.c

Modified: team/group/autoconf_and_menuselect/db1-ast/hash/hash.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/db1-ast/hash/hash.c?rev=20259&r1=20258&r2=20259&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/db1-ast/hash/hash.c (original)
+++ team/group/autoconf_and_menuselect/db1-ast/hash/hash.c Fri Apr 14 23:38:07 2006
@@ -52,8 +52,6 @@
 #endif
 
 #include "../include/asterisk.h"
-
-#include "../include/asterisk/compat.h"
 
 #include <db.h>
 #include "hash.h"