mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-04 12:12:48 +00:00
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/branches/1.2@50781 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)bt_close.c 8.7 (Berkeley) 8/17/94";
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
static int bt_meta __P((BTREE *));
|
static int bt_meta __P((BTREE *));
|
||||||
|
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)bt_conv.c 8.5 (Berkeley) 8/17/94";
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
static void mswap __P((PAGE *));
|
static void mswap __P((PAGE *));
|
||||||
|
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94";
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_delete.c 8.13 (Berkeley) 7/28/94";
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
static int __bt_bdelete __P((BTREE *, const DBT *));
|
static int __bt_bdelete __P((BTREE *, const DBT *));
|
||||||
|
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_get.c 8.6 (Berkeley) 7/20/94";
|
|||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -58,7 +58,7 @@ static char sccsid[] = "@(#)bt_open.c 8.10 (Berkeley) 8/17/94";
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_overflow.c 8.5 (Berkeley) 7/16/94";
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)bt_page.c 8.3 (Berkeley) 7/14/94";
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94";
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));
|
static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));
|
||||||
|
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)bt_search.c 8.8 (Berkeley) 7/31/94";
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *));
|
static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *));
|
||||||
|
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_seq.c 8.7 (Berkeley) 7/20/94";
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
static int __bt_first __P((BTREE *, const DBT *, EPG *, int *));
|
static int __bt_first __P((BTREE *, const DBT *, EPG *, int *));
|
||||||
|
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94";
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
static int bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *));
|
static int bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *));
|
||||||
|
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)bt_utils.c 8.8 (Berkeley) 7/20/94";
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "btree.h"
|
#include "btree.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)db.c 8.4 (Berkeley) 2/21/94";
|
|||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
|
|
||||||
#ifndef __APPLE__
|
#ifndef __APPLE__
|
||||||
#define dbopen __dbopen
|
#define dbopen __dbopen
|
||||||
|
@@ -53,7 +53,7 @@ static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94";
|
|||||||
|
|
||||||
#include "../include/asterisk/compat.h"
|
#include "../include/asterisk/compat.h"
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
#include "page.h"
|
#include "page.h"
|
||||||
#include "extern.h"
|
#include "extern.h"
|
||||||
|
@@ -67,7 +67,7 @@ static char sccsid[] = "@(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94";
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
#include "page.h"
|
#include "page.h"
|
||||||
#include "extern.h"
|
#include "extern.h"
|
||||||
|
@@ -65,7 +65,7 @@ static char sccsid[] = "@(#)hash_buf.c 8.5 (Berkeley) 7/15/94";
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
#include "page.h"
|
#include "page.h"
|
||||||
#include "extern.h"
|
#include "extern.h"
|
||||||
|
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)hash_func.c 8.2 (Berkeley) 2/21/94";
|
|||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
#include "page.h"
|
#include "page.h"
|
||||||
#include "extern.h"
|
#include "extern.h"
|
||||||
|
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)hash_log2.c 8.2 (Berkeley) 5/31/94";
|
|||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
|
|
||||||
u_int32_t __hash_log2 __P((u_int32_t));
|
u_int32_t __hash_log2 __P((u_int32_t));
|
||||||
|
|
||||||
|
@@ -67,7 +67,7 @@ static char sccsid[] = "@(#)hash_page.c 8.7 (Berkeley) 8/16/94";
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
#include "page.h"
|
#include "page.h"
|
||||||
#include "extern.h"
|
#include "extern.h"
|
||||||
|
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)hsearch.c 8.4 (Berkeley) 7/21/94";
|
|||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "search.h"
|
#include "search.h"
|
||||||
|
|
||||||
static DB *dbp = NULL;
|
static DB *dbp = NULL;
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
#ifndef _NDBM_H
|
#ifndef _NDBM_H
|
||||||
#define _NDBM_H 1
|
#define _NDBM_H 1
|
||||||
|
|
||||||
#include <db.h>
|
#include "db.h"
|
||||||
|
|
||||||
/* Map dbm interface onto db(3). */
|
/* Map dbm interface onto db(3). */
|
||||||
#define DBM_RDONLY O_RDONLY
|
#define DBM_RDONLY O_RDONLY
|
||||||
|
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94";
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
|
|
||||||
#define __MPOOLINTERFACE_PRIVATE
|
#define __MPOOLINTERFACE_PRIVATE
|
||||||
#include <mpool.h>
|
#include <mpool.h>
|
||||||
|
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rec_close.c 8.6 (Berkeley) 8/18/94";
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "recno.h"
|
#include "recno.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rec_delete.c 8.7 (Berkeley) 7/14/94";
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "recno.h"
|
#include "recno.h"
|
||||||
|
|
||||||
static int rec_rdelete __P((BTREE *, recno_t));
|
static int rec_rdelete __P((BTREE *, recno_t));
|
||||||
|
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)rec_get.c 8.9 (Berkeley) 8/18/94";
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "recno.h"
|
#include "recno.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -49,7 +49,7 @@ static char sccsid[] = "@(#)rec_open.c 8.10 (Berkeley) 9/1/94";
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "recno.h"
|
#include "recno.h"
|
||||||
|
|
||||||
DB *
|
DB *
|
||||||
|
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rec_put.c 8.7 (Berkeley) 8/18/94";
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "recno.h"
|
#include "recno.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)rec_search.c 8.4 (Berkeley) 7/14/94";
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "recno.h"
|
#include "recno.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rec_seq.c 8.3 (Berkeley) 7/14/94";
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "recno.h"
|
#include "recno.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)rec_utils.c 8.6 (Berkeley) 7/16/94";
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <db.h>
|
#include "../include/db.h"
|
||||||
#include "recno.h"
|
#include "recno.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user