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

diff --git a/main/db1-ast/btree/bt_close.c b/main/db1-ast/btree/bt_close.c
index 27f9ab660f98e2934a248e07dc759850629a0bb5..67a6e5340c0457c044f725709493f4c52ac4671a 100644 (file)
--- 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 <string.h>
 #include <unistd.h>
 
-#include <db.h>
+#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 1cb208b14d94707e12fb79376c22a2ab0d11469e..d2ebdc57b2f718c1073f3ee3af0109a19dc67574 100644 (file)
--- 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 <stdio.h>
 
-#include <db.h>
+#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 443f2bf99e1a101ef8957feb1bc7358860874899..e035851a8a1b1897ec4ed0a0dda7270ac3e9c880 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#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 9908a7c3eb39b201be541b600bd3cc3102fa4016..e816c432a6181a4acdaa0ffd14cfb9d3d6381ed7 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 
-#include <db.h>
+#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 74824c73f4b2e8366af58fe38581d32c969dd2c1..b5e18022ca556251a08b7c1856a5e7dddc24222f 100644 (file)
--- 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 <stddef.h>
 #include <stdio.h>
 
-#include <db.h>
+#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 8c2f48ebf5e66b01a4f50578c12770ce9fba0df7..5d40e4593007a5702e5c6cd836a3311720b4ff1d 100644 (file)
--- 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 <string.h>
 #include <unistd.h>
 
-#include <db.h>
+#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 b28b8e04711a54c7f1ded7c86db66e468bd1e084..d8f310d91f45ca5c2015baacf6649a13a8993d5d 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#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 ce9cbf15a646beb589d5e526107ae12f632813c3..e77a1d6b5d1dba010075493ba246a277d5d0e1a2 100644 (file)
--- 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 <stdio.h>
 
-#include <db.h>
+#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 3f38075310248d86f67db463599802d78baeb86e..aeb0bb16c2395becf152295850658c7271f33309 100644 (file)
--- 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 <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 *));

diff --git a/main/db1-ast/btree/bt_search.c b/main/db1-ast/btree/bt_search.c
index 485afcbbf025a68263e4e0af0889f5309e43a037..623f43949e246a996803c8bf6b1d9ff65fd1bce7 100644 (file)
--- 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 <stdio.h>
 
-#include <db.h>
+#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 5ba7b0301cdeac48e2ee53358a2535ba569f77ba..3f1724274c170cb119bdcfc769c6df51665c0764 100644 (file)
--- 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 <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 *));

diff --git a/main/db1-ast/btree/bt_split.c b/main/db1-ast/btree/bt_split.c
index e6bd540b4dceadb942472b9969de13f8f96be25a..8fede1e45292037adbb964cfeb21d402014799f0 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#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 1416c7862d7a145b3fb547ca38a680365779a6a1..2ecb5e678ad80afe6fe8c24efcd117e72465d3ce 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "btree.h"
 
 /*

diff --git a/main/db1-ast/db/db.c b/main/db1-ast/db/db.c
index c93b36ff75bc4a07c94ffa65c594fd4d1c59f175..8c0584d4cc0b16a73b5fe145c94fbe7b3096116d 100644 (file)
--- 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 <stddef.h>
 #include <stdio.h>
 
-#include <db.h>
+#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 99592eac51056a02909b2aa89c514ea024c8ed95..2355d606c02fdbd8c8f1db4ca7afba4651c8c503 100644 (file)
--- 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 <assert.h>
 #endif
 
-#include <db.h>
+#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 94c64083f5c35207f1386299559d039ef4f683b6..daa8c1f17541189bc87512ee6c25f7d4eb32dd05 100644 (file)
--- 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 <assert.h>
 #endif
 
-#include <db.h>
+#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 f47a7b08e6bed853e16ab6c75810914334e372eb..063dd8229179f7f49e52db1a4fff677ef4dfc08d 100644 (file)
--- 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 <assert.h>
 #endif
 
-#include <db.h>
+#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 4ec5def8c066c411a268845352f70e0eb0745505..4d7907b575ef3d7b907901229cb718520c888ad8 100644 (file)
--- 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 <sys/types.h>
 
-#include <db.h>
+#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 6bcf9c11451d8649cc7d6bd19d2e7cff6b572578..b86655d47db41ad3c69734d46be98bfdefabf0c5 100644 (file)
--- 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 <sys/types.h>
 
-#include <db.h>
+#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 1429dd6c3d805db83f5e43bd7f67b57ebb3ec3ad..737b97d32187e83ad72d622718014ca83f32fb32 100644 (file)
--- 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 <assert.h>
 #endif
 
-#include <db.h>
+#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 cc8f7a4aad1fa3039ca384f2ad85d4621fac199e..2971f930870373f028b685cc8ed86eb6382606f0 100644 (file)
--- 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 <fcntl.h>
 #include <string.h>
 
-#include <db.h>
+#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 db14dff2ed43778c3b9d49ab0c32a4935b18a8bc..d2079b0a5525a559c16b4edaf5388454c308df33 100644 (file)
--- 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 <db.h>
+#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 eca24e518de96b278f4a0869f6c2f9f14c9d3ebf..b5b7c86d65c25dac11ffb10d3b0b699f385d5a6a 100644 (file)
--- 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 <string.h>
 #include <unistd.h>
 
-#include <db.h>
+#include "../include/db.h"
 
 #define        __MPOOLINTERFACE_PRIVATE
 #include <mpool.h>

diff --git a/main/db1-ast/recno/rec_close.c b/main/db1-ast/recno/rec_close.c
index 8a3c4d77d6da2ddefabb6864449afd8dc41d4ac4..20b00f52c2c9afde79f13510f7b83831f8edd9f1 100644 (file)
--- 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 <stdio.h>
 #include <unistd.h>
 
-#include <db.h>
+#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 a16593d4e6a17704693ca46267cc7d4dc33044fd..fc20472263cdd8e21062d13407abe011ec729180 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 
-#include <db.h>
+#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 47dd773fb97f183b50dc4b1af7a86245784b0fef..7038cc81a18a09944055eed78ec70bef96f448e9 100644 (file)
--- 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 <string.h>
 #include <unistd.h>
 
-#include <db.h>
+#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 cf9511e872ae9badb486977dc0aae6a89971ab38..0ebc8c7c49b3cf1791c87720789c54b30bed2b62 100644 (file)
--- 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 <stdio.h>
 #include <unistd.h>
 
-#include <db.h>
+#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 5454c40e8d215adf3031fff62ece090a42a15af5..3316998675595875b0288f771961dca5af25ee01 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#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 acc109e9925b1d6ac3e33ecf19dc1b7619719dd7..e70fe4c13bd71fda7253a01846463f835776003d 100644 (file)
--- 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 <errno.h>
 #include <stdio.h>
 
-#include <db.h>
+#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 2f8c7695c5d316c38fc4eb8fbfc46816eafcb798..ca3451ca615b473c7ee29de8aed9689f2c390891 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 
-#include <db.h>
+#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 c4c0380461eedebc2c050bcfedeeb006ff502de0..ddc3097125e5e598af2a0f0741fd23d7a6c65f84 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "../include/db.h"
 #include "recno.h"
 
 /*