diff options
| author | Mark Spencer <markster@digium.com> | 2004-06-28 20:10:28 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-06-28 20:10:28 +0000 |
| commit | 09c41b415de2fe3ac5dce1fccde75133549767eb (patch) | |
| tree | 68e35e870e04a117796cc68b7aa3987cb2c0341c /db1-ast | |
| parent | 9b6bd35ed347e16417c0f93711a8f0292bccab10 (diff) | |
Merge OSX compatibility patch (bug #1940)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'db1-ast')
| -rwxr-xr-x | db1-ast/btree/bt_debug.c | 2 | ||||
| -rwxr-xr-x | db1-ast/mpool/mpool.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/db1-ast/btree/bt_debug.c b/db1-ast/btree/bt_debug.c index 3aefbe762..443f2bf99 100755 --- a/db1-ast/btree/bt_debug.c +++ b/db1-ast/btree/bt_debug.c @@ -38,6 +38,7 @@ static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94"; #endif /* LIBC_SCCS and not lint */ +#ifdef DEBUG #include <sys/param.h> #include <stdio.h> @@ -47,7 +48,6 @@ static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94"; #include <db.h> #include "btree.h" -#ifdef DEBUG /* * BT_DUMP -- Dump the tree * diff --git a/db1-ast/mpool/mpool.c b/db1-ast/mpool/mpool.c index 6773e4e23..eca24e518 100755 --- a/db1-ast/mpool/mpool.c +++ b/db1-ast/mpool/mpool.c @@ -50,6 +50,8 @@ static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94"; #define __MPOOLINTERFACE_PRIVATE #include <mpool.h> +#undef __APPLE__ + #ifndef __APPLE__ #define mpool_open __mpool_open #define mpool_filter __mpool_filter @@ -311,6 +313,8 @@ mpool_sync(mp) return (fsync(mp->fd) ? RET_ERROR : RET_SUCCESS); } +#define __APPLE__ + #ifndef __APPLE__ #undef mpool_open #undef mpool_filter |