From 0aca2c116cc8e7639edb3df385aa713c19b9b881 Mon Sep 17 00:00:00 2001 From: markster Date: Sun, 27 Apr 2003 18:13:11 +0000 Subject: More BSD enhancements git-svn-id: http://svn.digium.com/svn/asterisk/trunk@916 f38db490-d61c-443f-a65b-d21fe96a405b --- db1-ast/include/db.h | 20 ++++++++++---------- db1-ast/include/mpool.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'db1-ast') diff --git a/db1-ast/include/db.h b/db1-ast/include/db.h index 8b7921f97..f00c4df9f 100755 --- a/db1-ast/include/db.h +++ b/db1-ast/include/db.h @@ -117,14 +117,14 @@ typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE; /* 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 @@ typedef struct { 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 @@ typedef struct { 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; diff --git a/db1-ast/include/mpool.h b/db1-ast/include/mpool.h index 22c9feabd..56f17f90d 100755 --- a/db1-ast/include/mpool.h +++ b/db1-ast/include/mpool.h @@ -70,9 +70,9 @@ typedef struct MPOOL { 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; -- cgit v1.2.3