From: Automerge Script Date: Sun, 14 Jan 2007 06:13:36 +0000 (+0000) Subject: automerge commit X-Git-Tag: 1.2.15-netsec~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f80eaea4eeaf565ee682454e98f86e0243c374f1;p=thirdparty%2Fasterisk.git automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@50819 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/db1-ast/btree/bt_close.c b/db1-ast/btree/bt_close.c index 27f9ab660f..67a6e5340c 100644 --- a/db1-ast/btree/bt_close.c +++ b/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/db1-ast/btree/bt_conv.c b/db1-ast/btree/bt_conv.c index 1cb208b14d..d2ebdc57b2 100644 --- a/db1-ast/btree/bt_conv.c +++ b/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/db1-ast/btree/bt_debug.c b/db1-ast/btree/bt_debug.c index 443f2bf99e..e035851a8a 100644 --- a/db1-ast/btree/bt_debug.c +++ b/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/db1-ast/btree/bt_delete.c b/db1-ast/btree/bt_delete.c index 9908a7c3eb..e816c432a6 100644 --- a/db1-ast/btree/bt_delete.c +++ b/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/db1-ast/btree/bt_get.c b/db1-ast/btree/bt_get.c index 74824c73f4..b5e18022ca 100644 --- a/db1-ast/btree/bt_get.c +++ b/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/db1-ast/btree/bt_open.c b/db1-ast/btree/bt_open.c index 8c2f48ebf5..5d40e45930 100644 --- a/db1-ast/btree/bt_open.c +++ b/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/db1-ast/btree/bt_overflow.c b/db1-ast/btree/bt_overflow.c index b28b8e0471..d8f310d91f 100644 --- a/db1-ast/btree/bt_overflow.c +++ b/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/db1-ast/btree/bt_page.c b/db1-ast/btree/bt_page.c index ce9cbf15a6..e77a1d6b5d 100644 --- a/db1-ast/btree/bt_page.c +++ b/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/db1-ast/btree/bt_put.c b/db1-ast/btree/bt_put.c index 3f38075310..aeb0bb16c2 100644 --- a/db1-ast/btree/bt_put.c +++ b/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/db1-ast/btree/bt_search.c b/db1-ast/btree/bt_search.c index 485afcbbf0..623f43949e 100644 --- a/db1-ast/btree/bt_search.c +++ b/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/db1-ast/btree/bt_seq.c b/db1-ast/btree/bt_seq.c index 5ba7b0301c..3f1724274c 100644 --- a/db1-ast/btree/bt_seq.c +++ b/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/db1-ast/btree/bt_split.c b/db1-ast/btree/bt_split.c index e6bd540b4d..8fede1e452 100644 --- a/db1-ast/btree/bt_split.c +++ b/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/db1-ast/btree/bt_utils.c b/db1-ast/btree/bt_utils.c index 1416c7862d..2ecb5e678a 100644 --- a/db1-ast/btree/bt_utils.c +++ b/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/db1-ast/db/db.c b/db1-ast/db/db.c index 5a74061e0b..ced186e438 100644 --- a/db1-ast/db/db.c +++ b/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" #ifndef __APPLE__ #define dbopen __dbopen diff --git a/db1-ast/hash/hash.c b/db1-ast/hash/hash.c index 187cdca53a..b7544601f4 100644 --- a/db1-ast/hash/hash.c +++ b/db1-ast/hash/hash.c @@ -53,7 +53,7 @@ static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94"; #include "../include/asterisk/compat.h" -#include +#include "../include/db.h" #include "hash.h" #include "page.h" #include "extern.h" diff --git a/db1-ast/hash/hash_bigkey.c b/db1-ast/hash/hash_bigkey.c index 94c64083f5..daa8c1f175 100644 --- a/db1-ast/hash/hash_bigkey.c +++ b/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/db1-ast/hash/hash_buf.c b/db1-ast/hash/hash_buf.c index f47a7b08e6..063dd82291 100644 --- a/db1-ast/hash/hash_buf.c +++ b/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/db1-ast/hash/hash_func.c b/db1-ast/hash/hash_func.c index 4ec5def8c0..4d7907b575 100644 --- a/db1-ast/hash/hash_func.c +++ b/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/db1-ast/hash/hash_log2.c b/db1-ast/hash/hash_log2.c index 6bcf9c1145..b86655d47d 100644 --- a/db1-ast/hash/hash_log2.c +++ b/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/db1-ast/hash/hash_page.c b/db1-ast/hash/hash_page.c index 1429dd6c3d..737b97d321 100644 --- a/db1-ast/hash/hash_page.c +++ b/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/db1-ast/hash/hsearch.c b/db1-ast/hash/hsearch.c index cc8f7a4aad..2971f93087 100644 --- a/db1-ast/hash/hsearch.c +++ b/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/db1-ast/include/ndbm.h b/db1-ast/include/ndbm.h index db14dff2ed..d2079b0a55 100644 --- a/db1-ast/include/ndbm.h +++ b/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/db1-ast/mpool/mpool.c b/db1-ast/mpool/mpool.c index eca24e518d..b5b7c86d65 100644 --- a/db1-ast/mpool/mpool.c +++ b/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/db1-ast/recno/rec_close.c b/db1-ast/recno/rec_close.c index 8a3c4d77d6..20b00f52c2 100644 --- a/db1-ast/recno/rec_close.c +++ b/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/db1-ast/recno/rec_delete.c b/db1-ast/recno/rec_delete.c index a16593d4e6..fc20472263 100644 --- a/db1-ast/recno/rec_delete.c +++ b/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/db1-ast/recno/rec_get.c b/db1-ast/recno/rec_get.c index 47dd773fb9..7038cc81a1 100644 --- a/db1-ast/recno/rec_get.c +++ b/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/db1-ast/recno/rec_open.c b/db1-ast/recno/rec_open.c index cf9511e872..0ebc8c7c49 100644 --- a/db1-ast/recno/rec_open.c +++ b/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/db1-ast/recno/rec_put.c b/db1-ast/recno/rec_put.c index 5454c40e8d..3316998675 100644 --- a/db1-ast/recno/rec_put.c +++ b/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/db1-ast/recno/rec_search.c b/db1-ast/recno/rec_search.c index acc109e992..e70fe4c13b 100644 --- a/db1-ast/recno/rec_search.c +++ b/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/db1-ast/recno/rec_seq.c b/db1-ast/recno/rec_seq.c index 2f8c7695c5..ca3451ca61 100644 --- a/db1-ast/recno/rec_seq.c +++ b/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/db1-ast/recno/rec_utils.c b/db1-ast/recno/rec_utils.c index c4c0380461..ddc3097125 100644 --- a/db1-ast/recno/rec_utils.c +++ b/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" /*