Eliminate BSD-types.

diff --git a/rpmdb/db3.c b/rpmdb/db3.c
index fbb5ebe..5112499 100644 (file)
--- a/rpmdb/db3.c
+++ b/rpmdb/db3.c
@@ -201,7 +201,7 @@ static int db3_fsync_disable(int fd)
  * dbenv->failchk() callback method for determining is the given pid/tid 
  * is alive. We only care about pid's though. 
  */ 
-static int db3isalive(DB_ENV *dbenv, pid_t pid, db_threadid_t tid, u_int32_t flags)
+static int db3isalive(DB_ENV *dbenv, pid_t pid, db_threadid_t tid, uint32_t flags)
 {
     int alive = 0;
 
@@ -777,7 +777,7 @@ static int db3open(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip)
     DB * db = NULL;
     DB_ENV * dbenv = NULL;
     DB_TXN * txnid = NULL;
-    u_int32_t oflags;
+    uint32_t oflags;
     int _printit;
 
     if (dbip)

diff --git a/rpmdb/merge.c b/rpmdb/merge.c
index 5576e52..dd80af4 100644 (file)
--- a/rpmdb/merge.c
+++ b/rpmdb/merge.c
@@ -113,7 +113,7 @@ static void
 insertionsort(unsigned char *a, size_t n, size_t size,
                int (*cmp) (const void *, const void *))
 {
-       u_char *ai, *s, *t, *u, tmp;
+       unsigned char *ai, *s, *t, *u, tmp;
        int i;
 
        for (ai = a+size; --n >= 1; ai += size)

diff --git a/rpmdb/tjfn.c b/rpmdb/tjfn.c
index e42e790..3507553 100644 (file)
--- a/rpmdb/tjfn.c
+++ b/rpmdb/tjfn.c
@@ -33,7 +33,7 @@ static int
 db_init(const char * home, DB_ENV ** dbenvp)
 {
     DB_ENV * dbenv;
-    u_int32_t flags;
+    uint32_t flags;
     int ret;
 
     if ((ret = db_env_create(&dbenv, 0)) != 0)

diff --git a/rpmio/fts.c b/rpmio/fts.c
index 7d6cff1..f009a89 100644 (file)
--- a/rpmio/fts.c
+++ b/rpmio/fts.c
@@ -132,7 +132,7 @@ Fts_open(char * const * argv, int options,
        }
 
        /* Allocate/initialize the stream */
-       if ((sp = malloc((u_int)sizeof(*sp))) == NULL)
+       if ((sp = malloc(sizeof(*sp))) == NULL)
                return (NULL);
        memset(sp, 0, sizeof(*sp));
        sp->fts_compar = (int (*) (const void *, const void *)) compar;