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: http://svn.digium.com/svn/asterisk/trunk@50783 f38db490-d61c-443f-a65b-d21fe96a405b

main/db1-ast/btree/bt_close.c

@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)bt_close.c	8.7 (Berkeley) 8/17/94";
 #include <string.h>
 #include <unistd.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static int bt_meta __P((BTREE *));

main/db1-ast/btree/bt_conv.c

@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)bt_conv.c	8.5 (Berkeley) 8/17/94";
 
 #include <stdio.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static void mswap __P((PAGE *));

main/db1-ast/btree/bt_debug.c

@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_debug.c	8.5 (Berkeley) 8/17/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 /*

main/db1-ast/btree/bt_delete.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_delete.c	8.13 (Berkeley) 7/28/94";
 #include <stdio.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static int __bt_bdelete __P((BTREE *, const DBT *));

main/db1-ast/btree/bt_get.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_get.c	8.6 (Berkeley) 7/20/94";
 #include <stddef.h>
 #include <stdio.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 /*

main/db1-ast/btree/bt_open.c

@@ -58,7 +58,7 @@ static char sccsid[] = "@(#)bt_open.c	8.10 (Berkeley) 8/17/94";
 #include <string.h>
 #include <unistd.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 #ifdef DEBUG

main/db1-ast/btree/bt_overflow.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_overflow.c	8.5 (Berkeley) 7/16/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 /*

main/db1-ast/btree/bt_page.c

@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)bt_page.c	8.3 (Berkeley) 7/14/94";
 
 #include <stdio.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 /*

main/db1-ast/btree/bt_put.c

@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_put.c	8.8 (Berkeley) 7/26/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));

main/db1-ast/btree/bt_search.c

@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)bt_search.c	8.8 (Berkeley) 7/31/94";
 
 #include <stdio.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *));

main/db1-ast/btree/bt_seq.c

@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_seq.c	8.7 (Berkeley) 7/20/94";
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static int __bt_first __P((BTREE *, const DBT *, EPG *, int *));

main/db1-ast/btree/bt_split.c

@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_split.c	8.9 (Berkeley) 7/26/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 static int	 bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *));

main/db1-ast/btree/bt_utils.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_utils.c	8.8 (Berkeley) 7/20/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 /*

main/db1-ast/db/db.c

@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)db.c	8.4 (Berkeley) 2/21/94";
 #include <stddef.h>
 #include <stdio.h>
 
-#include <db.h>
+#include "../include/db.h"
 
 DB *
 dbopen(fname, flags, mode, type, openinfo)

main/db1-ast/hash/hash.c

@@ -51,7 +51,7 @@ static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
 #include <assert.h>
 #endif
 
-#include <db.h>
+#include "../include/db.h"
 #include "hash.h"
 #include "page.h"
 #include "extern.h"

main/db1-ast/hash/hash_bigkey.c

@@ -67,7 +67,7 @@ static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
 #include <assert.h>
 #endif
 
-#include <db.h>
+#include "../include/db.h"
 #include "hash.h"
 #include "page.h"
 #include "extern.h"

main/db1-ast/hash/hash_buf.c

@@ -65,7 +65,7 @@ static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
 #include <assert.h>
 #endif
 
-#include <db.h>
+#include "../include/db.h"
 #include "hash.h"
 #include "page.h"
 #include "extern.h"

main/db1-ast/hash/hash_func.c

@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)hash_func.c	8.2 (Berkeley) 2/21/94";
 
 #include <sys/types.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "hash.h"
 #include "page.h"
 #include "extern.h"

main/db1-ast/hash/hash_log2.c

@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)hash_log2.c	8.2 (Berkeley) 5/31/94";
 
 #include <sys/types.h>
 
-#include <db.h>
+#include "../include/db.h"
 
 u_int32_t __hash_log2 __P((u_int32_t));
 

main/db1-ast/hash/hash_page.c

@@ -67,7 +67,7 @@ static char sccsid[] = "@(#)hash_page.c	8.7 (Berkeley) 8/16/94";
 #include <assert.h>
 #endif
 
-#include <db.h>
+#include "../include/db.h"
 #include "hash.h"
 #include "page.h"
 #include "extern.h"

main/db1-ast/hash/hsearch.c

@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)hsearch.c	8.4 (Berkeley) 7/21/94";
 #include <fcntl.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "search.h"
 
 static DB *dbp = NULL;

main/db1-ast/include/ndbm.h

@@ -39,7 +39,7 @@
 #ifndef _NDBM_H
 #define	_NDBM_H 1
 
-#include <db.h>
+#include "db.h"
 
 /* Map dbm interface onto db(3). */
 #define DBM_RDONLY	O_RDONLY

main/db1-ast/mpool/mpool.c

@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)mpool.c	8.5 (Berkeley) 7/26/94";
 #include <string.h>
 #include <unistd.h>
 
-#include <db.h>
+#include "../include/db.h"
 
 #define	__MPOOLINTERFACE_PRIVATE
 #include <mpool.h>

main/db1-ast/recno/rec_close.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rec_close.c	8.6 (Berkeley) 8/18/94";
 #include <stdio.h>
 #include <unistd.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "recno.h"
 
 /*

main/db1-ast/recno/rec_delete.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rec_delete.c	8.7 (Berkeley) 7/14/94";
 #include <stdio.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "recno.h"
 
 static int rec_rdelete __P((BTREE *, recno_t));

main/db1-ast/recno/rec_get.c

@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rec_get.c	8.9 (Berkeley) 8/18/94";
 #include <string.h>
 #include <unistd.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "recno.h"
 
 /*

main/db1-ast/recno/rec_open.c

@@ -49,7 +49,7 @@ static char sccsid[] = "@(#)rec_open.c	8.10 (Berkeley) 9/1/94";
 #include <stdio.h>
 #include <unistd.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "recno.h"
 
 DB *

main/db1-ast/recno/rec_put.c

@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rec_put.c	8.7 (Berkeley) 8/18/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "recno.h"
 
 /*

main/db1-ast/recno/rec_search.c

@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)rec_search.c	8.4 (Berkeley) 7/14/94";
 #include <errno.h>
 #include <stdio.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "recno.h"
 
 /*

main/db1-ast/recno/rec_seq.c

@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rec_seq.c	8.3 (Berkeley) 7/14/94";
 #include <stdio.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "recno.h"
 
 /*

main/db1-ast/recno/rec_utils.c

@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)rec_utils.c	8.6 (Berkeley) 7/16/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "recno.h"
 
 /*