File db.1.85.__P.diff of Package db1

--- btree/btree.h
+++ btree/btree.h	2004/09/11 12:23:25
@@ -343,11 +343,11 @@
 	EPGNO	  bt_last;		/* last insert */
 
 					/* B: key comparison function */
-	int	(*bt_cmp) __P((const DBT *, const DBT *));
+	int	(*bt_cmp) __PMT((const DBT *, const DBT *));
 					/* B: prefix comparison function */
-	size_t	(*bt_pfx) __P((const DBT *, const DBT *));
+	size_t	(*bt_pfx) __PMT((const DBT *, const DBT *));
 					/* R: recno input function */
-	int	(*bt_irec) __P((struct _btree *, recno_t));
+	int	(*bt_irec) __PMT((struct _btree *, recno_t));
 
 	FILE	 *bt_rfp;		/* R: record FILE pointer */
 	int	  bt_rfd;		/* R: record file descriptor */
--- db/db.c
+++ db/db.c	2004/09/11 12:07:09
@@ -80,7 +80,7 @@
 weak_alias (__dbopen, dbopen)
 
 static int
-__dberr __P((void))
+__dberr (void)
 {
 	return (RET_ERROR);
 }
@@ -96,14 +96,14 @@
 	DB *dbp;
 {
 	/* The only thing that can succeed is a close. */
-	dbp->del = (int (*)__P((const struct __db *,
-				const DBT *, u_int))) __dberr;
-	dbp->get = (int (*)__P((const struct __db *,
-				const DBT *, DBT *, u_int))) __dberr;
-	dbp->put = (int (*)__P((const struct __db *,
-				DBT *, const DBT *, u_int))) __dberr;
-	dbp->seq = (int (*)__P((const struct __db *,
-				DBT *, DBT *, u_int))) __dberr;
-	dbp->sync = (int (*)__P((const struct __db *, u_int))) __dberr;
-	dbp->fd = (int (*)__P((const struct __db *))) __dberr;
+	dbp->del = (int (*)(const struct __db *,
+				const DBT *, u_int)) __dberr;
+	dbp->get = (int (*)(const struct __db *,
+				const DBT *, DBT *, u_int)) __dberr;
+	dbp->put = (int (*)(const struct __db *,
+				DBT *, const DBT *, u_int)) __dberr;
+	dbp->seq = (int (*)(const struct __db *,
+				DBT *, DBT *, u_int)) __dberr;
+	dbp->sync = (int (*)(const struct __db *, u_int)) __dberr;
+	dbp->fd = (int (*)(const struct __db *)) __dberr;
 }
--- hash/extern.h
+++ hash/extern.h	2004/09/11 12:07:09
@@ -58,7 +58,7 @@
 int	 __split_page __P((HTAB *, u_int32_t, u_int32_t));
 
 /* Default hash routine. */
-extern u_int32_t (*__default_hash) __P((const void *, size_t));
+extern u_int32_t (*__default_hash) __PMT((const void *, size_t));
 
 #ifdef HASH_STATISTICS
 extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
--- hash/hash.h
+++ hash/hash.h	2004/09/11 12:07:36
@@ -95,7 +95,7 @@
 	int		exsegs;		/* Number of extra allocated
 					 * segments */
 	u_int32_t			/* Hash function */
-	    (*hash)__P((const void *, size_t));
+	    (*hash)(const void *, size_t);
 	int		flags;		/* Flag values */
 	int		fp;		/* File pointer */
 	char		*tmp_buf;	/* Temporary Buffer for BIG data */
--- mpool/mpool.c
+++ mpool/mpool.c	2004/09/11 12:24:34
@@ -109,8 +109,8 @@
 void
 mpool_filter(mp, pgin, pgout, pgcookie)
 	MPOOL *mp;
-	void (*pgin) __P((void *, pgno_t, void *));
-	void (*pgout) __P((void *, pgno_t, void *));
+	void (*pgin) __PMT((void *, pgno_t, void *));
+	void (*pgout) __PMT((void *, pgno_t, void *));
 	void *pgcookie;
 {
 	mp->pgin = pgin;
--- PORT/linux/db_dump185.c
+++ PORT/linux/db_dump185.c	2004/09/11 12:22:37
@@ -15,6 +15,7 @@
 #ifndef NO_SYSTEM_INCLUDES
 #include <sys/types.h>
 
+#include <err.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -124,11 +125,11 @@
 	EPGNO	  bt_last;		/* last insert */
 
 					/* B: key comparison function */
-	int	(*bt_cmp) __P((const DBT *, const DBT *));
+	int	(*bt_cmp) __PMT((const DBT *, const DBT *));
 					/* B: prefix comparison function */
-	size_t	(*bt_pfx) __P((const DBT *, const DBT *));
+	size_t	(*bt_pfx) __PMT((const DBT *, const DBT *));
 					/* R: recno input function */
-	int	(*bt_irec) __P((struct _btree *, u_int32_t));
+	int	(*bt_irec) __PMT((struct _btree *, u_int32_t));
 
 	FILE	 *bt_rfp;		/* R: record FILE pointer */
 	int	  bt_rfd;		/* R: record file descriptor */