all: Move headers to library-specific directory include/berkeley-db.

Signed-off-by: Damien George <damien@micropython.org>

btree/bt_close.c

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

btree/bt_conv.c

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

btree/bt_debug.c

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

btree/bt_delete.c

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

btree/bt_get.c

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

btree/bt_open.c

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

btree/bt_overflow.c

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

btree/bt_page.c

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

btree/bt_put.c

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

btree/bt_search.c

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

btree/bt_seq.c

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

btree/bt_split.c

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

btree/bt_utils.c

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

hash/hash.c

@@ -51,10 +51,10 @@ static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
 #include <assert.h>
 #endif
 
-#include <db.h>
+#include "berkeley-db/db.h"
-#include "hash.h"
+#include "berkeley-db/hash.h"
-#include "page.h"
+#include "berkeley-db/page.h"
-#include "extern.h"
+#include "berkeley-db/hash_extern.h"
 
 static int   alloc_segs __P((HTAB *, int));
 static int   flush_meta __P((HTAB *));

hash/hash_bigkey.c

@@ -67,10 +67,10 @@ static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
 #include <assert.h>
 #endif
 
-#include <db.h>
+#include "berkeley-db/db.h"
-#include "hash.h"
+#include "berkeley-db/hash.h"
-#include "page.h"
+#include "berkeley-db/page.h"
-#include "extern.h"
+#include "berkeley-db/hash_extern.h"
 
 static int collect_key __P((HTAB *, BUFHEAD *, int, DBT *, int));
 static int collect_data __P((HTAB *, BUFHEAD *, int, int));

hash/hash_buf.c

@@ -65,10 +65,10 @@ static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
 #include <assert.h>
 #endif
 
-#include <db.h>
+#include "berkeley-db/db.h"
-#include "hash.h"
+#include "berkeley-db/hash.h"
-#include "page.h"
+#include "berkeley-db/page.h"
-#include "extern.h"
+#include "berkeley-db/hash_extern.h"
 
 static BUFHEAD *newbuf __P((HTAB *, u_int32_t, BUFHEAD *));
 

hash/hash_func.c

@@ -40,10 +40,10 @@ static char sccsid[] = "@(#)hash_func.c	8.2 (Berkeley) 2/21/94";
 
 #include <sys/types.h>
 
-#include <db.h>
+#include "berkeley-db/db.h"
-#include "hash.h"
+#include "berkeley-db/hash.h"
-#include "page.h"
+#include "berkeley-db/page.h"
-#include "extern.h"
+#include "berkeley-db/hash_extern.h"
 
 static u_int32_t hash1 __P((const void *, size_t));
 static u_int32_t hash2 __P((const void *, size_t));

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 "berkeley-db/db.h"
 
 u_int32_t
 __log2(num)

hash/hash_page.c

@@ -67,10 +67,10 @@ static char sccsid[] = "@(#)hash_page.c	8.7 (Berkeley) 8/16/94";
 #include <assert.h>
 #endif
 
-#include <db.h>
+#include "berkeley-db/db.h"
-#include "hash.h"
+#include "berkeley-db/hash.h"
-#include "page.h"
+#include "berkeley-db/page.h"
-#include "extern.h"
+#include "berkeley-db/hash_extern.h"
 
 static u_int32_t	*fetch_bitmap __P((HTAB *, int));
 static u_int32_t	 first_free __P((u_int32_t));

hash/hsearch.c

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

hash/ndbm.c

@@ -48,8 +48,8 @@ static char sccsid[] = "@(#)ndbm.c	8.4 (Berkeley) 7/21/94";
 #include <stdio.h>
 #include <string.h>
 
-#include <ndbm.h>
+#include "berkeley-db/ndbm.h"
-#include "hash.h"
+#include "berkeley-db/hash.h"
 
 /*
  * Returns:

include/berkeley-db/btree.h

@@ -41,7 +41,7 @@
 #define	F_CLR(p, f)	(p)->flags &= ~(f)
 #define	F_ISSET(p, f)	((p)->flags & (f))
 
-#include <mpool.h>
+#include "berkeley-db/mpool.h"
 
 #define	DEFMINKEYPAGE	(2)		/* Minimum keys per page */
 #ifndef	MINCACHE
@@ -385,4 +385,4 @@ typedef struct _btree {
 	u_int32_t flags;
 } BTREE;
 
-#include "extern.h"
+#include "berkeley-db/btree_extern.h"

include/berkeley-db/db.h

@@ -41,9 +41,9 @@
 
 #include <limits.h>
 
-#include <filevtable.h>
+#include "berkeley-db/filevtable.h"
 #ifdef __DBINTERFACE_PRIVATE
-#include <compat.h>
+#include "berkeley-db/compat.h"
 #endif
 
 #define	RET_ERROR	-1		/* Return values. */

include/berkeley-db/mpool.h

@@ -33,8 +33,8 @@
  *	@(#)mpool.h	8.2 (Berkeley) 7/14/94
  */
 
-#include <bsd-queue.h>
+#include "berkeley-db/bsd-queue.h"
-#include <filevtable.h>
+#include "berkeley-db/filevtable.h"
 
 /*
  * The memory pool scheme is a simple one.  Each in-memory page is referenced

mpool/mpool.c

@@ -36,17 +36,17 @@ static char sccsid[] = "@(#)mpool.c	8.5 (Berkeley) 7/26/94";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
-#include <bsd-queue.h>
 
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "berkeley-db/bsd-queue.h"
+#include "berkeley-db/db.h"
 
 #define	__MPOOLINTERFACE_PRIVATE
-#include <mpool.h>
+#include "berkeley-db/mpool.h"
 
 static BKT *mpool_bkt __P((MPOOL *));
 static BKT *mpool_look __P((MPOOL *, pgno_t));

recno/rec_close.c

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

recno/rec_delete.c

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

recno/rec_get.c

@@ -44,8 +44,8 @@ static char sccsid[] = "@(#)rec_get.c	8.9 (Berkeley) 8/18/94";
 #include <string.h>
 #include <unistd.h>
 
-#include <db.h>
+#include "berkeley-db/db.h"
-#include "recno.h"
+#include "berkeley-db/recno.h"
 
 /*
  * __REC_GET -- Get a record from the btree.

recno/rec_open.c

@@ -49,8 +49,8 @@ static char sccsid[] = "@(#)rec_open.c	8.10 (Berkeley) 9/1/94";
 #include <stdio.h>
 #include <unistd.h>
 
-#include <db.h>
+#include "berkeley-db/db.h"
-#include "recno.h"
+#include "berkeley-db/recno.h"
 
 DB *
 __rec_open(fname, flags, mode, openinfo, dflags)

recno/rec_put.c

@@ -42,8 +42,8 @@ static char sccsid[] = "@(#)rec_put.c	8.7 (Berkeley) 8/18/94";
 #include <stdlib.h>
 #include <string.h>
 
-#include <db.h>
+#include "berkeley-db/db.h"
-#include "recno.h"
+#include "berkeley-db/recno.h"
 
 /*
  * __REC_PUT -- Add a recno item to the tree.

recno/rec_search.c

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

recno/rec_seq.c

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

recno/rec_utils.c

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