--- Libc/Libc-1725.40.4/include/db.h
+++ Libc/Libc-320/include/db.h
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
 /*-
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -101,11 +125,11 @@
 typedef struct __db {
 	DBTYPE type;			/* Underlying db type. */
 	int (*close)(struct __db *);
-	int (*del)(const struct __db *, const DBT *, unsigned int);
-	int (*get)(const struct __db *, const DBT *, DBT *, unsigned int);
-	int (*put)(const struct __db *, DBT *, const DBT *, unsigned int);
-	int (*seq)(const struct __db *, DBT *, DBT *, unsigned int);
-	int (*sync)(const struct __db *, unsigned int);
+	int (*del)(const struct __db *, const DBT *, u_int);
+	int (*get)(const struct __db *, const DBT *, DBT *, u_int);
+	int (*put)(const struct __db *, DBT *, const DBT *, u_int);
+	int (*seq)(const struct __db *, DBT *, DBT *, u_int);
+	int (*sync)(const struct __db *, u_int);
 	void *internal;			/* Access method private. */
 	int (*fd)(const struct __db *);
 } DB;
@@ -116,16 +140,16 @@
 /* Structure used to pass parameters to the btree routines. */
 typedef struct {
 #define	R_DUP		0x01	/* duplicate keys */
-	unsigned long	flags;
-	unsigned int	cachesize;	/* bytes to cache */
-	int		maxkeypage;	/* maximum keys per page */
-	int		minkeypage;	/* minimum keys per page */
-	unsigned int	psize;		/* page size */
-	int		(*compare)	/* comparison function */
-			(const DBT *, const DBT *);
-	size_t		(*prefix)	/* prefix function */
-	    		(const DBT *, const DBT *);
-	int		lorder;		/* byte order */
+	u_long	flags;
+	u_int	cachesize;	/* bytes to cache */
+	int	maxkeypage;	/* maximum keys per page */
+	int	minkeypage;	/* minimum keys per page */
+	u_int	psize;		/* page size */
+	int	(*compare)	/* comparison function */
+	    (const DBT *, const DBT *);
+	size_t	(*prefix)	/* prefix function */
+	    (const DBT *, const DBT *);
+	int	lorder;		/* byte order */
 } BTREEINFO;
 
 #define	HASHMAGIC	0x061561
@@ -133,10 +157,10 @@
 
 /* Structure used to pass parameters to the hashing routines. */
 typedef struct {
-	unsigned int	bsize;		/* bucket size */
-	unsigned int	ffactor;	/* fill factor */
-	unsigned int	nelem;		/* number of elements */
-	unsigned int	cachesize;	/* bytes to cache */
+	u_int	bsize;		/* bucket size */
+	u_int	ffactor;	/* fill factor */
+	u_int	nelem;		/* number of elements */
+	u_int	cachesize;	/* bytes to cache */
 	u_int32_t		/* hash function */
 		(*hash)(const void *, size_t);
 	int	lorder;		/* byte order */
@@ -147,12 +171,12 @@
 #define	R_FIXEDLEN	0x01	/* fixed-length records */
 #define	R_NOKEY		0x02	/* key not required */
 #define	R_SNAPSHOT	0x04	/* snapshot the input */
-	unsigned long	flags;
-	unsigned int	cachesize;	/* bytes to cache */
-	unsigned int	psize;		/* page size */
-	int		lorder;		/* byte order */
-	size_t		reclen;		/* record length (fixed-length records) */
-	unsigned char	bval;		/* delimiting byte (variable-length records */
+	u_long	flags;
+	u_int	cachesize;	/* bytes to cache */
+	u_int	psize;		/* page size */
+	int	lorder;		/* byte order */
+	size_t	reclen;		/* record length (fixed-length records) */
+	u_char	bval;		/* delimiting byte (variable-length records */
 	char	*bfname;	/* btree file name */ 
 } RECNOINFO;