[asterisk-commits] tilghman: branch 1.4 r50782 - in /branches/1.4:
./ main/db1-ast/btree/ main/d...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Jan 13 22:13:48 MST 2007
Author: tilghman
Date: Sat Jan 13 23:13:47 2007
New Revision: 50782
URL: http://svn.digium.com/view/asterisk?view=rev&rev=50782
Log:
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)
........
Modified:
branches/1.4/ (props changed)
branches/1.4/main/db1-ast/btree/bt_close.c
branches/1.4/main/db1-ast/btree/bt_conv.c
branches/1.4/main/db1-ast/btree/bt_debug.c
branches/1.4/main/db1-ast/btree/bt_delete.c
branches/1.4/main/db1-ast/btree/bt_get.c
branches/1.4/main/db1-ast/btree/bt_open.c
branches/1.4/main/db1-ast/btree/bt_overflow.c
branches/1.4/main/db1-ast/btree/bt_page.c
branches/1.4/main/db1-ast/btree/bt_put.c
branches/1.4/main/db1-ast/btree/bt_search.c
branches/1.4/main/db1-ast/btree/bt_seq.c
branches/1.4/main/db1-ast/btree/bt_split.c
branches/1.4/main/db1-ast/btree/bt_utils.c
branches/1.4/main/db1-ast/db/db.c
branches/1.4/main/db1-ast/hash/hash.c
branches/1.4/main/db1-ast/hash/hash_bigkey.c
branches/1.4/main/db1-ast/hash/hash_buf.c
branches/1.4/main/db1-ast/hash/hash_func.c
branches/1.4/main/db1-ast/hash/hash_log2.c
branches/1.4/main/db1-ast/hash/hash_page.c
branches/1.4/main/db1-ast/hash/hsearch.c
branches/1.4/main/db1-ast/include/ndbm.h
branches/1.4/main/db1-ast/mpool/mpool.c
branches/1.4/main/db1-ast/recno/rec_close.c
branches/1.4/main/db1-ast/recno/rec_delete.c
branches/1.4/main/db1-ast/recno/rec_get.c
branches/1.4/main/db1-ast/recno/rec_open.c
branches/1.4/main/db1-ast/recno/rec_put.c
branches/1.4/main/db1-ast/recno/rec_search.c
branches/1.4/main/db1-ast/recno/rec_seq.c
branches/1.4/main/db1-ast/recno/rec_utils.c
Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Modified: branches/1.4/main/db1-ast/btree/bt_close.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_close.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_close.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_close.c Sat Jan 13 23:13:47 2007
@@ -46,7 +46,7 @@
#include <string.h>
#include <unistd.h>
-#include <db.h>
+#include "../include/db.h"
#include "btree.h"
static int bt_meta __P((BTREE *));
Modified: branches/1.4/main/db1-ast/btree/bt_conv.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_conv.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_conv.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_conv.c Sat Jan 13 23:13:47 2007
@@ -42,7 +42,7 @@
#include <stdio.h>
-#include <db.h>
+#include "../include/db.h"
#include "btree.h"
static void mswap __P((PAGE *));
Modified: branches/1.4/main/db1-ast/btree/bt_debug.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_debug.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_debug.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_debug.c Sat Jan 13 23:13:47 2007
@@ -45,7 +45,7 @@
#include <stdlib.h>
#include <string.h>
-#include <db.h>
+#include "../include/db.h"
#include "btree.h"
/*
Modified: branches/1.4/main/db1-ast/btree/bt_delete.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_delete.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_delete.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_delete.c Sat Jan 13 23:13:47 2007
@@ -44,7 +44,7 @@
#include <stdio.h>
#include <string.h>
-#include <db.h>
+#include "../include/db.h"
#include "btree.h"
static int __bt_bdelete __P((BTREE *, const DBT *));
Modified: branches/1.4/main/db1-ast/btree/bt_get.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_get.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_get.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_get.c Sat Jan 13 23:13:47 2007
@@ -44,7 +44,7 @@
#include <stddef.h>
#include <stdio.h>
-#include <db.h>
+#include "../include/db.h"
#include "btree.h"
/*
Modified: branches/1.4/main/db1-ast/btree/bt_open.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_open.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_open.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_open.c Sat Jan 13 23:13:47 2007
@@ -58,7 +58,7 @@
#include <string.h>
#include <unistd.h>
-#include <db.h>
+#include "../include/db.h"
#include "btree.h"
#ifdef DEBUG
Modified: branches/1.4/main/db1-ast/btree/bt_overflow.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_overflow.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_overflow.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_overflow.c Sat Jan 13 23:13:47 2007
@@ -44,7 +44,7 @@
#include <stdlib.h>
#include <string.h>
-#include <db.h>
+#include "../include/db.h"
#include "btree.h"
/*
Modified: branches/1.4/main/db1-ast/btree/bt_page.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_page.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_page.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_page.c Sat Jan 13 23:13:47 2007
@@ -39,7 +39,7 @@
#include <stdio.h>
-#include <db.h>
+#include "../include/db.h"
#include "btree.h"
/*
Modified: branches/1.4/main/db1-ast/btree/bt_put.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_put.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_put.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_put.c Sat Jan 13 23:13:47 2007
@@ -45,7 +45,7 @@
#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 *));
Modified: branches/1.4/main/db1-ast/btree/bt_search.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_search.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_search.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_search.c Sat Jan 13 23:13:47 2007
@@ -42,7 +42,7 @@
#include <stdio.h>
-#include <db.h>
+#include "../include/db.h"
#include "btree.h"
static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *));
Modified: branches/1.4/main/db1-ast/btree/bt_seq.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_seq.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_seq.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_seq.c Sat Jan 13 23:13:47 2007
@@ -45,7 +45,7 @@
#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 *));
Modified: branches/1.4/main/db1-ast/btree/bt_split.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_split.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_split.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_split.c Sat Jan 13 23:13:47 2007
@@ -45,7 +45,7 @@
#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 *));
Modified: branches/1.4/main/db1-ast/btree/bt_utils.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/btree/bt_utils.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/btree/bt_utils.c (original)
+++ branches/1.4/main/db1-ast/btree/bt_utils.c Sat Jan 13 23:13:47 2007
@@ -44,7 +44,7 @@
#include <stdlib.h>
#include <string.h>
-#include <db.h>
+#include "../include/db.h"
#include "btree.h"
/*
Modified: branches/1.4/main/db1-ast/db/db.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/db/db.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/db/db.c (original)
+++ branches/1.4/main/db1-ast/db/db.c Sat Jan 13 23:13:47 2007
@@ -42,7 +42,7 @@
#include <stddef.h>
#include <stdio.h>
-#include <db.h>
+#include "../include/db.h"
DB *
dbopen(fname, flags, mode, type, openinfo)
Modified: branches/1.4/main/db1-ast/hash/hash.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/hash/hash.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/hash/hash.c (original)
+++ branches/1.4/main/db1-ast/hash/hash.c Sat Jan 13 23:13:47 2007
@@ -51,7 +51,7 @@
#include <assert.h>
#endif
-#include <db.h>
+#include "../include/db.h"
#include "hash.h"
#include "page.h"
#include "extern.h"
Modified: branches/1.4/main/db1-ast/hash/hash_bigkey.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/hash/hash_bigkey.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/hash/hash_bigkey.c (original)
+++ branches/1.4/main/db1-ast/hash/hash_bigkey.c Sat Jan 13 23:13:47 2007
@@ -67,7 +67,7 @@
#include <assert.h>
#endif
-#include <db.h>
+#include "../include/db.h"
#include "hash.h"
#include "page.h"
#include "extern.h"
Modified: branches/1.4/main/db1-ast/hash/hash_buf.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/hash/hash_buf.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/hash/hash_buf.c (original)
+++ branches/1.4/main/db1-ast/hash/hash_buf.c Sat Jan 13 23:13:47 2007
@@ -65,7 +65,7 @@
#include <assert.h>
#endif
-#include <db.h>
+#include "../include/db.h"
#include "hash.h"
#include "page.h"
#include "extern.h"
Modified: branches/1.4/main/db1-ast/hash/hash_func.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/hash/hash_func.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/hash/hash_func.c (original)
+++ branches/1.4/main/db1-ast/hash/hash_func.c Sat Jan 13 23:13:47 2007
@@ -40,7 +40,7 @@
#include <sys/types.h>
-#include <db.h>
+#include "../include/db.h"
#include "hash.h"
#include "page.h"
#include "extern.h"
Modified: branches/1.4/main/db1-ast/hash/hash_log2.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/hash/hash_log2.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/hash/hash_log2.c (original)
+++ branches/1.4/main/db1-ast/hash/hash_log2.c Sat Jan 13 23:13:47 2007
@@ -40,7 +40,7 @@
#include <sys/types.h>
-#include <db.h>
+#include "../include/db.h"
u_int32_t __hash_log2 __P((u_int32_t));
Modified: branches/1.4/main/db1-ast/hash/hash_page.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/hash/hash_page.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/hash/hash_page.c (original)
+++ branches/1.4/main/db1-ast/hash/hash_page.c Sat Jan 13 23:13:47 2007
@@ -67,7 +67,7 @@
#include <assert.h>
#endif
-#include <db.h>
+#include "../include/db.h"
#include "hash.h"
#include "page.h"
#include "extern.h"
Modified: branches/1.4/main/db1-ast/hash/hsearch.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/hash/hsearch.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/hash/hsearch.c (original)
+++ branches/1.4/main/db1-ast/hash/hsearch.c Sat Jan 13 23:13:47 2007
@@ -43,7 +43,7 @@
#include <fcntl.h>
#include <string.h>
-#include <db.h>
+#include "../include/db.h"
#include "search.h"
static DB *dbp = NULL;
Modified: branches/1.4/main/db1-ast/include/ndbm.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/include/ndbm.h?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/include/ndbm.h (original)
+++ branches/1.4/main/db1-ast/include/ndbm.h Sat Jan 13 23:13:47 2007
@@ -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
Modified: branches/1.4/main/db1-ast/mpool/mpool.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/mpool/mpool.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/mpool/mpool.c (original)
+++ branches/1.4/main/db1-ast/mpool/mpool.c Sat Jan 13 23:13:47 2007
@@ -45,7 +45,7 @@
#include <string.h>
#include <unistd.h>
-#include <db.h>
+#include "../include/db.h"
#define __MPOOLINTERFACE_PRIVATE
#include <mpool.h>
Modified: branches/1.4/main/db1-ast/recno/rec_close.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/recno/rec_close.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/recno/rec_close.c (original)
+++ branches/1.4/main/db1-ast/recno/rec_close.c Sat Jan 13 23:13:47 2007
@@ -44,7 +44,7 @@
#include <stdio.h>
#include <unistd.h>
-#include <db.h>
+#include "../include/db.h"
#include "recno.h"
/*
Modified: branches/1.4/main/db1-ast/recno/rec_delete.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/recno/rec_delete.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/recno/rec_delete.c (original)
+++ branches/1.4/main/db1-ast/recno/rec_delete.c Sat Jan 13 23:13:47 2007
@@ -44,7 +44,7 @@
#include <stdio.h>
#include <string.h>
-#include <db.h>
+#include "../include/db.h"
#include "recno.h"
static int rec_rdelete __P((BTREE *, recno_t));
Modified: branches/1.4/main/db1-ast/recno/rec_get.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/recno/rec_get.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/recno/rec_get.c (original)
+++ branches/1.4/main/db1-ast/recno/rec_get.c Sat Jan 13 23:13:47 2007
@@ -44,7 +44,7 @@
#include <string.h>
#include <unistd.h>
-#include <db.h>
+#include "../include/db.h"
#include "recno.h"
/*
Modified: branches/1.4/main/db1-ast/recno/rec_open.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/recno/rec_open.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/recno/rec_open.c (original)
+++ branches/1.4/main/db1-ast/recno/rec_open.c Sat Jan 13 23:13:47 2007
@@ -49,7 +49,7 @@
#include <stdio.h>
#include <unistd.h>
-#include <db.h>
+#include "../include/db.h"
#include "recno.h"
DB *
Modified: branches/1.4/main/db1-ast/recno/rec_put.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/recno/rec_put.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/recno/rec_put.c (original)
+++ branches/1.4/main/db1-ast/recno/rec_put.c Sat Jan 13 23:13:47 2007
@@ -42,7 +42,7 @@
#include <stdlib.h>
#include <string.h>
-#include <db.h>
+#include "../include/db.h"
#include "recno.h"
/*
Modified: branches/1.4/main/db1-ast/recno/rec_search.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/recno/rec_search.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/recno/rec_search.c (original)
+++ branches/1.4/main/db1-ast/recno/rec_search.c Sat Jan 13 23:13:47 2007
@@ -40,7 +40,7 @@
#include <errno.h>
#include <stdio.h>
-#include <db.h>
+#include "../include/db.h"
#include "recno.h"
/*
Modified: branches/1.4/main/db1-ast/recno/rec_seq.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/recno/rec_seq.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/recno/rec_seq.c (original)
+++ branches/1.4/main/db1-ast/recno/rec_seq.c Sat Jan 13 23:13:47 2007
@@ -42,7 +42,7 @@
#include <stdio.h>
#include <string.h>
-#include <db.h>
+#include "../include/db.h"
#include "recno.h"
/*
Modified: branches/1.4/main/db1-ast/recno/rec_utils.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/db1-ast/recno/rec_utils.c?view=diff&rev=50782&r1=50781&r2=50782
==============================================================================
--- branches/1.4/main/db1-ast/recno/rec_utils.c (original)
+++ branches/1.4/main/db1-ast/recno/rec_utils.c Sat Jan 13 23:13:47 2007
@@ -41,7 +41,7 @@
#include <stdlib.h>
#include <string.h>
-#include <db.h>
+#include "../include/db.h"
#include "recno.h"
/*
More information about the asterisk-commits
mailing list