From 29f496ef12247a2401d02428fa533020b588f5b6 Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 24 Apr 2006 17:11:45 +0000
Subject: Thanks to the fine work of Russell Bryant and Dancho Lazarov, we now
 have autoconf and menuselect tools for Asterisk!

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22267 f38db490-d61c-443f-a65b-d21fe96a405b
---
 db1-ast/Makefile    | 6 +++++-
 db1-ast/hash/hash.c | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'db1-ast')

diff --git a/db1-ast/Makefile b/db1-ast/Makefile
index d36b592f9..3d218c25a 100644
--- a/db1-ast/Makefile
+++ b/db1-ast/Makefile
@@ -13,6 +13,10 @@ 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)
 PROG=	db_dump185
 OBJ1=	hash.o hash_bigkey.o hash_buf.o hash_func.o hash_log2.o hash_page.o \
@@ -58,7 +62,7 @@ endif
 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
diff --git a/db1-ast/hash/hash.c b/db1-ast/hash/hash.c
index 187cdca53..99592eac5 100644
--- a/db1-ast/hash/hash.c
+++ b/db1-ast/hash/hash.c
@@ -51,8 +51,6 @@ static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
 #include <assert.h>
 #endif
 
-#include "../include/asterisk/compat.h"
-
 #include <db.h>
 #include "hash.h"
 #include "page.h"
-- 
cgit v1.2.3