From f9db8abd4d1bfa16f4135638c600ba0eaadec083 Mon Sep 17 00:00:00 2001 From: markster Date: Sun, 26 Oct 2003 18:50:49 +0000 Subject: Make it build and run on MacOS X git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1673 f38db490-d61c-443f-a65b-d21fe96a405b --- db1-ast/db/db.c | 2 ++ db1-ast/include/db.h | 2 +- db1-ast/mpool/mpool.c | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'db1-ast') diff --git a/db1-ast/db/db.c b/db1-ast/db/db.c index 0bee00bdb..ab739ed78 100755 --- a/db1-ast/db/db.c +++ b/db1-ast/db/db.c @@ -75,9 +75,11 @@ dbopen(fname, flags, mode, type, openinfo) return (NULL); } #undef dbopen +#ifndef __APPLE__ #define weak_alias(original, alias) \ asm (".weak " #alias "\n" #alias " = " #original); weak_alias (__dbopen, dbopen) +#endif static int __dberr __P((void)) diff --git a/db1-ast/include/db.h b/db1-ast/include/db.h index 2a279b5aa..06ae36b82 100755 --- a/db1-ast/include/db.h +++ b/db1-ast/include/db.h @@ -51,7 +51,7 @@ #ifndef __BIT_TYPES_DEFINED__ #define __BIT_TYPES_DEFINED__ -#ifndef __FreeBSD__ +#if (!defined(__FreeBSD__) && !defined(__APPLE__)) typedef __signed char int8_t; typedef unsigned char u_int8_t; typedef short int16_t; diff --git a/db1-ast/mpool/mpool.c b/db1-ast/mpool/mpool.c index 80b02b93b..b09f801f5 100755 --- a/db1-ast/mpool/mpool.c +++ b/db1-ast/mpool/mpool.c @@ -316,6 +316,8 @@ mpool_sync(mp) #undef mpool_put #undef mpool_close #undef mpool_sync + +#ifndef __APPLE__ #define weak_alias(original, alias) \ asm (".weak " #alias "\n" #alias " = " #original); weak_alias (__mpool_open, mpool_open) @@ -325,6 +327,7 @@ weak_alias (__mpool_get, mpool_get) weak_alias (__mpool_put, mpool_put) weak_alias (__mpool_close, mpool_close) weak_alias (__mpool_sync, mpool_sync) +#endif /* * mpool_bkt -- cgit v1.2.3