From b2cb3f86c418afbfe0772a48c15f110c97c7cc2c Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Sun, 14 Jan 2007 05:19:09 +0000 Subject: Merged revisions 50782 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r50782 | tilghman | 2007-01-13 23:13:47 -0600 (Sat, 13 Jan 2007) | 10 lines Merged revisions 50781 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r50781 | tilghman | 2007-01-13 23:01:16 -0600 (Sat, 13 Jan 2007) | 2 lines Bug 8814 - db should look for its header using a relative path, instead of the system path (Fixes FreeWRT) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50783 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/db1-ast/btree/bt_close.c | 2 +- main/db1-ast/btree/bt_conv.c | 2 +- main/db1-ast/btree/bt_debug.c | 2 +- main/db1-ast/btree/bt_delete.c | 2 +- main/db1-ast/btree/bt_get.c | 2 +- main/db1-ast/btree/bt_open.c | 2 +- main/db1-ast/btree/bt_overflow.c | 2 +- main/db1-ast/btree/bt_page.c | 2 +- main/db1-ast/btree/bt_put.c | 2 +- main/db1-ast/btree/bt_search.c | 2 +- main/db1-ast/btree/bt_seq.c | 2 +- main/db1-ast/btree/bt_split.c | 2 +- main/db1-ast/btree/bt_utils.c | 2 +- main/db1-ast/db/db.c | 2 +- main/db1-ast/hash/hash.c | 2 +- main/db1-ast/hash/hash_bigkey.c | 2 +- main/db1-ast/hash/hash_buf.c | 2 +- main/db1-ast/hash/hash_func.c | 2 +- main/db1-ast/hash/hash_log2.c | 2 +- main/db1-ast/hash/hash_page.c | 2 +- main/db1-ast/hash/hsearch.c | 2 +- main/db1-ast/include/ndbm.h | 2 +- main/db1-ast/mpool/mpool.c | 2 +- main/db1-ast/recno/rec_close.c | 2 +- main/db1-ast/recno/rec_delete.c | 2 +- main/db1-ast/recno/rec_get.c | 2 +- main/db1-ast/recno/rec_open.c | 2 +- main/db1-ast/recno/rec_put.c | 2 +- main/db1-ast/recno/rec_search.c | 2 +- main/db1-ast/recno/rec_seq.c | 2 +- main/db1-ast/recno/rec_utils.c | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) (limited to 'main/db1-ast') diff --git a/main/db1-ast/btree/bt_close.c b/main/db1-ast/btree/bt_close.c index 27f9ab660..67a6e5340 100644 --- a/main/db1-ast/btree/bt_close.c +++ b/main/db1-ast/btree/bt_close.c @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)bt_close.c 8.7 (Berkeley) 8/17/94"; #include #include -#include +#include "../include/db.h" #include "btree.h" static int bt_meta __P((BTREE *)); diff --git a/main/db1-ast/btree/bt_conv.c b/main/db1-ast/btree/bt_conv.c index 1cb208b14..d2ebdc57b 100644 --- a/main/db1-ast/btree/bt_conv.c +++ b/main/db1-ast/btree/bt_conv.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)bt_conv.c 8.5 (Berkeley) 8/17/94"; #include -#include +#include "../include/db.h" #include "btree.h" static void mswap __P((PAGE *)); diff --git a/main/db1-ast/btree/bt_debug.c b/main/db1-ast/btree/bt_debug.c index 443f2bf99..e035851a8 100644 --- a/main/db1-ast/btree/bt_debug.c +++ b/main/db1-ast/btree/bt_debug.c @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94"; #include #include -#include +#include "../include/db.h" #include "btree.h" /* diff --git a/main/db1-ast/btree/bt_delete.c b/main/db1-ast/btree/bt_delete.c index 9908a7c3e..e816c432a 100644 --- a/main/db1-ast/btree/bt_delete.c +++ b/main/db1-ast/btree/bt_delete.c @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_delete.c 8.13 (Berkeley) 7/28/94"; #include #include -#include +#include "../include/db.h" #include "btree.h" static int __bt_bdelete __P((BTREE *, const DBT *)); diff --git a/main/db1-ast/btree/bt_get.c b/main/db1-ast/btree/bt_get.c index 74824c73f..b5e18022c 100644 --- a/main/db1-ast/btree/bt_get.c +++ b/main/db1-ast/btree/bt_get.c @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_get.c 8.6 (Berkeley) 7/20/94"; #include #include -#include +#include "../include/db.h" #include "btree.h" /* diff --git a/main/db1-ast/btree/bt_open.c b/main/db1-ast/btree/bt_open.c index 8c2f48ebf..5d40e4593 100644 --- a/main/db1-ast/btree/bt_open.c +++ b/main/db1-ast/btree/bt_open.c @@ -58,7 +58,7 @@ static char sccsid[] = "@(#)bt_open.c 8.10 (Berkeley) 8/17/94"; #include #include -#include +#include "../include/db.h" #include "btree.h" #ifdef DEBUG diff --git a/main/db1-ast/btree/bt_overflow.c b/main/db1-ast/btree/bt_overflow.c index b28b8e047..d8f310d91 100644 --- a/main/db1-ast/btree/bt_overflow.c +++ b/main/db1-ast/btree/bt_overflow.c @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_overflow.c 8.5 (Berkeley) 7/16/94"; #include #include -#include +#include "../include/db.h" #include "btree.h" /* diff --git a/main/db1-ast/btree/bt_page.c b/main/db1-ast/btree/bt_page.c index ce9cbf15a..e77a1d6b5 100644 --- a/main/db1-ast/btree/bt_page.c +++ b/main/db1-ast/btree/bt_page.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)bt_page.c 8.3 (Berkeley) 7/14/94"; #include -#include +#include "../include/db.h" #include "btree.h" /* diff --git a/main/db1-ast/btree/bt_put.c b/main/db1-ast/btree/bt_put.c index 3f3807531..aeb0bb16c 100644 --- a/main/db1-ast/btree/bt_put.c +++ b/main/db1-ast/btree/bt_put.c @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94"; #include #include -#include +#include "../include/db.h" #include "btree.h" static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *)); diff --git a/main/db1-ast/btree/bt_search.c b/main/db1-ast/btree/bt_search.c index 485afcbbf..623f43949 100644 --- a/main/db1-ast/btree/bt_search.c +++ b/main/db1-ast/btree/bt_search.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)bt_search.c 8.8 (Berkeley) 7/31/94"; #include -#include +#include "../include/db.h" #include "btree.h" static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *)); diff --git a/main/db1-ast/btree/bt_seq.c b/main/db1-ast/btree/bt_seq.c index 5ba7b0301..3f1724274 100644 --- a/main/db1-ast/btree/bt_seq.c +++ b/main/db1-ast/btree/bt_seq.c @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_seq.c 8.7 (Berkeley) 7/20/94"; #include #include -#include +#include "../include/db.h" #include "btree.h" static int __bt_first __P((BTREE *, const DBT *, EPG *, int *)); diff --git a/main/db1-ast/btree/bt_split.c b/main/db1-ast/btree/bt_split.c index e6bd540b4..8fede1e45 100644 --- a/main/db1-ast/btree/bt_split.c +++ b/main/db1-ast/btree/bt_split.c @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94"; #include #include -#include +#include "../include/db.h" #include "btree.h" static int bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *)); diff --git a/main/db1-ast/btree/bt_utils.c b/main/db1-ast/btree/bt_utils.c index 1416c7862..2ecb5e678 100644 --- a/main/db1-ast/btree/bt_utils.c +++ b/main/db1-ast/btree/bt_utils.c @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_utils.c 8.8 (Berkeley) 7/20/94"; #include #include -#include +#include "../include/db.h" #include "btree.h" /* diff --git a/main/db1-ast/db/db.c b/main/db1-ast/db/db.c index c93b36ff7..8c0584d4c 100644 --- a/main/db1-ast/db/db.c +++ b/main/db1-ast/db/db.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)db.c 8.4 (Berkeley) 2/21/94"; #include #include -#include +#include "../include/db.h" DB * dbopen(fname, flags, mode, type, openinfo) diff --git a/main/db1-ast/hash/hash.c b/main/db1-ast/hash/hash.c index 99592eac5..2355d606c 100644 --- a/main/db1-ast/hash/hash.c +++ b/main/db1-ast/hash/hash.c @@ -51,7 +51,7 @@ static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94"; #include #endif -#include +#include "../include/db.h" #include "hash.h" #include "page.h" #include "extern.h" diff --git a/main/db1-ast/hash/hash_bigkey.c b/main/db1-ast/hash/hash_bigkey.c index 94c64083f..daa8c1f17 100644 --- a/main/db1-ast/hash/hash_bigkey.c +++ b/main/db1-ast/hash/hash_bigkey.c @@ -67,7 +67,7 @@ static char sccsid[] = "@(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94"; #include #endif -#include +#include "../include/db.h" #include "hash.h" #include "page.h" #include "extern.h" diff --git a/main/db1-ast/hash/hash_buf.c b/main/db1-ast/hash/hash_buf.c index f47a7b08e..063dd8229 100644 --- a/main/db1-ast/hash/hash_buf.c +++ b/main/db1-ast/hash/hash_buf.c @@ -65,7 +65,7 @@ static char sccsid[] = "@(#)hash_buf.c 8.5 (Berkeley) 7/15/94"; #include #endif -#include +#include "../include/db.h" #include "hash.h" #include "page.h" #include "extern.h" diff --git a/main/db1-ast/hash/hash_func.c b/main/db1-ast/hash/hash_func.c index 4ec5def8c..4d7907b57 100644 --- a/main/db1-ast/hash/hash_func.c +++ b/main/db1-ast/hash/hash_func.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)hash_func.c 8.2 (Berkeley) 2/21/94"; #include -#include +#include "../include/db.h" #include "hash.h" #include "page.h" #include "extern.h" diff --git a/main/db1-ast/hash/hash_log2.c b/main/db1-ast/hash/hash_log2.c index 6bcf9c114..b86655d47 100644 --- a/main/db1-ast/hash/hash_log2.c +++ b/main/db1-ast/hash/hash_log2.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)hash_log2.c 8.2 (Berkeley) 5/31/94"; #include -#include +#include "../include/db.h" u_int32_t __hash_log2 __P((u_int32_t)); diff --git a/main/db1-ast/hash/hash_page.c b/main/db1-ast/hash/hash_page.c index 1429dd6c3..737b97d32 100644 --- a/main/db1-ast/hash/hash_page.c +++ b/main/db1-ast/hash/hash_page.c @@ -67,7 +67,7 @@ static char sccsid[] = "@(#)hash_page.c 8.7 (Berkeley) 8/16/94"; #include #endif -#include +#include "../include/db.h" #include "hash.h" #include "page.h" #include "extern.h" diff --git a/main/db1-ast/hash/hsearch.c b/main/db1-ast/hash/hsearch.c index cc8f7a4aa..2971f9308 100644 --- a/main/db1-ast/hash/hsearch.c +++ b/main/db1-ast/hash/hsearch.c @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)hsearch.c 8.4 (Berkeley) 7/21/94"; #include #include -#include +#include "../include/db.h" #include "search.h" static DB *dbp = NULL; diff --git a/main/db1-ast/include/ndbm.h b/main/db1-ast/include/ndbm.h index db14dff2e..d2079b0a5 100644 --- a/main/db1-ast/include/ndbm.h +++ b/main/db1-ast/include/ndbm.h @@ -39,7 +39,7 @@ #ifndef _NDBM_H #define _NDBM_H 1 -#include +#include "db.h" /* Map dbm interface onto db(3). */ #define DBM_RDONLY O_RDONLY diff --git a/main/db1-ast/mpool/mpool.c b/main/db1-ast/mpool/mpool.c index eca24e518..b5b7c86d6 100644 --- a/main/db1-ast/mpool/mpool.c +++ b/main/db1-ast/mpool/mpool.c @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94"; #include #include -#include +#include "../include/db.h" #define __MPOOLINTERFACE_PRIVATE #include diff --git a/main/db1-ast/recno/rec_close.c b/main/db1-ast/recno/rec_close.c index 8a3c4d77d..20b00f52c 100644 --- a/main/db1-ast/recno/rec_close.c +++ b/main/db1-ast/recno/rec_close.c @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rec_close.c 8.6 (Berkeley) 8/18/94"; #include #include -#include +#include "../include/db.h" #include "recno.h" /* diff --git a/main/db1-ast/recno/rec_delete.c b/main/db1-ast/recno/rec_delete.c index a16593d4e..fc2047226 100644 --- a/main/db1-ast/recno/rec_delete.c +++ b/main/db1-ast/recno/rec_delete.c @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rec_delete.c 8.7 (Berkeley) 7/14/94"; #include #include -#include +#include "../include/db.h" #include "recno.h" static int rec_rdelete __P((BTREE *, recno_t)); diff --git a/main/db1-ast/recno/rec_get.c b/main/db1-ast/recno/rec_get.c index 47dd773fb..7038cc81a 100644 --- a/main/db1-ast/recno/rec_get.c +++ b/main/db1-ast/recno/rec_get.c @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rec_get.c 8.9 (Berkeley) 8/18/94"; #include #include -#include +#include "../include/db.h" #include "recno.h" /* diff --git a/main/db1-ast/recno/rec_open.c b/main/db1-ast/recno/rec_open.c index cf9511e87..0ebc8c7c4 100644 --- a/main/db1-ast/recno/rec_open.c +++ b/main/db1-ast/recno/rec_open.c @@ -49,7 +49,7 @@ static char sccsid[] = "@(#)rec_open.c 8.10 (Berkeley) 9/1/94"; #include #include -#include +#include "../include/db.h" #include "recno.h" DB * diff --git a/main/db1-ast/recno/rec_put.c b/main/db1-ast/recno/rec_put.c index 5454c40e8..331699867 100644 --- a/main/db1-ast/recno/rec_put.c +++ b/main/db1-ast/recno/rec_put.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rec_put.c 8.7 (Berkeley) 8/18/94"; #include #include -#include +#include "../include/db.h" #include "recno.h" /* diff --git a/main/db1-ast/recno/rec_search.c b/main/db1-ast/recno/rec_search.c index acc109e99..e70fe4c13 100644 --- a/main/db1-ast/recno/rec_search.c +++ b/main/db1-ast/recno/rec_search.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)rec_search.c 8.4 (Berkeley) 7/14/94"; #include #include -#include +#include "../include/db.h" #include "recno.h" /* diff --git a/main/db1-ast/recno/rec_seq.c b/main/db1-ast/recno/rec_seq.c index 2f8c7695c..ca3451ca6 100644 --- a/main/db1-ast/recno/rec_seq.c +++ b/main/db1-ast/recno/rec_seq.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rec_seq.c 8.3 (Berkeley) 7/14/94"; #include #include -#include +#include "../include/db.h" #include "recno.h" /* diff --git a/main/db1-ast/recno/rec_utils.c b/main/db1-ast/recno/rec_utils.c index c4c038046..ddc309712 100644 --- a/main/db1-ast/recno/rec_utils.c +++ b/main/db1-ast/recno/rec_utils.c @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)rec_utils.c 8.6 (Berkeley) 7/16/94"; #include #include -#include +#include "../include/db.h" #include "recno.h" /* -- cgit v1.2.3