[Asterisk-Dev] Different patch for __PMT in db1-ast

[Thorsten Lockert]

Many (most?) systems defined __P for prototypes, and almost none
define __PMT.  All systems that *do* define __PMT defines it to
be the same as __P anyways.

This changes db1-ast to just use __P since that is more common.

Index: db1-ast/include/db.h
===================================================================
RCS file: /usr/cvsroot/asterisk/db1-ast/include/db.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 db.h
--- db1-ast/include/db.h	12 Feb 2003 13:59:15 -0000	1.1.1.1
+++ db1-ast/include/db.h	27 Apr 2003 15:38:32 -0000
@@ -117,14 +117,14 @@
 /* Access method description structure. */
 typedef struct __db {
 	DBTYPE type;			/* Underlying db type. */
-	int (*close)	__PMT((struct __db *));
-	int (*del)	__PMT((const struct __db *, const DBT *, u_int));
-	int (*get)	__PMT((const struct __db *, const DBT *, DBT *, u_int));
-	int (*put)	__PMT((const struct __db *, DBT *, const DBT *, u_int));
-	int (*seq)	__PMT((const struct __db *, DBT *, DBT *, u_int));
-	int (*sync)	__PMT((const struct __db *, u_int));
+	int (*close)	__P((struct __db *));
+	int (*del)	__P((const struct __db *, const DBT *, u_int));
+	int (*get)	__P((const struct __db *, const DBT *, DBT *, u_int));
+	int (*put)	__P((const struct __db *, DBT *, const DBT *, u_int));
+	int (*seq)	__P((const struct __db *, DBT *, DBT *, u_int));
+	int (*sync)	__P((const struct __db *, u_int));
 	void *internal;			/* Access method private. */
-	int (*fd)	__PMT((const struct __db *));
+	int (*fd)	__P((const struct __db *));
 } DB;
 
 #define	BTREEMAGIC	0x053162
@@ -139,9 +139,9 @@
 	int	minkeypage;	/* minimum keys per page */
 	u_int	psize;		/* page size */
 	int	(*compare)	/* comparison function */
-	    __PMT((const DBT *, const DBT *));
+	    __P((const DBT *, const DBT *));
 	size_t	(*prefix)	/* prefix function */
-	    __PMT((const DBT *, const DBT *));
+	    __P((const DBT *, const DBT *));
 	int	lorder;		/* byte order */
 } BTREEINFO;
 
@@ -155,7 +155,7 @@
 	u_int	nelem;		/* number of elements */
 	u_int	cachesize;	/* bytes to cache */
 	u_int32_t		/* hash function */
-		(*hash) __PMT((const void *, size_t));
+		(*hash) __P((const void *, size_t));
 	int	lorder;		/* byte order */
 } HASHINFO;
 
Index: db1-ast/include/mpool.h
===================================================================
RCS file: /usr/cvsroot/asterisk/db1-ast/include/mpool.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mpool.h
--- db1-ast/include/mpool.h	12 Feb 2003 13:59:15 -0000	1.1.1.1
+++ db1-ast/include/mpool.h	27 Apr 2003 15:38:32 -0000
@@ -70,9 +70,9 @@
 	u_long	pagesize;		/* file page size */
 	int	fd;			/* file descriptor */
 					/* page in conversion routine */
-	void    (*pgin) __PMT((void *, pgno_t, void *));
+	void    (*pgin) __P((void *, pgno_t, void *));
 					/* page out conversion routine */
-	void    (*pgout) __PMT((void *, pgno_t, void *));
+	void    (*pgout) __P((void *, pgno_t, void *));
 	void	*pgcookie;		/* cookie for page in/out routines */
 #ifdef STATISTICS
 	u_long	cachehit;
--
Thorsten Lockert      | tholo at sigmasoft.com | Universe, n.:
2121 N. Lakeshore Dr. | tholo at openbsd.org   |         The problem.
Chapel Hill, NC 27514 |                     |