diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 80219ddfc..7fd5a5b47 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,4 +1,12 @@ -2013-01-06 Mike Frysinger +2014-01-06 Mike Frysinger + + * libc/search/hash.c (hash_delete): Change __uint32_t to u_int. + (hash_get): Likewise. + (hash_put): Likewise. + (hash_seq): Likewise. + (hash_sync): Likewise. + +2014-01-06 Mike Frysinger * libc/ctype/jp2uc.c: Include string.h. diff --git a/newlib/libc/search/hash.c b/newlib/libc/search/hash.c index 2b102c8f8..5fea88a82 100644 --- a/newlib/libc/search/hash.c +++ b/newlib/libc/search/hash.c @@ -63,13 +63,13 @@ static int alloc_segs(HTAB *, int); static int flush_meta(HTAB *); static int hash_access(HTAB *, ACTION, DBT *, DBT *); static int hash_close(DB *); -static int hash_delete(const DB *, const DBT *, __uint32_t); +static int hash_delete(const DB *, const DBT *, u_int); static int hash_fd(const DB *); -static int hash_get(const DB *, const DBT *, DBT *, __uint32_t); -static int hash_put(const DB *, DBT *, const DBT *, __uint32_t); +static int hash_get(const DB *, const DBT *, DBT *, u_int); +static int hash_put(const DB *, DBT *, const DBT *, u_int); static void *hash_realloc(SEGMENT **, int, int); -static int hash_seq(const DB *, DBT *, DBT *, __uint32_t); -static int hash_sync(const DB *, __uint32_t); +static int hash_seq(const DB *, DBT *, DBT *, u_int); +static int hash_sync(const DB *, u_int); static int hdestroy(HTAB *); static HTAB *init_hash(HTAB *, const char *, const HASHINFO *); static int init_htab(HTAB *, int); @@ -494,7 +494,7 @@ hdestroy(hashp) static int hash_sync(dbp, flags) const DB *dbp; - __uint32_t flags; + u_int flags; { HTAB *hashp; @@ -573,7 +573,7 @@ hash_get(dbp, key, data, flag) const DB *dbp; const DBT *key; DBT *data; - __uint32_t flag; + u_int flag; { HTAB *hashp; @@ -590,7 +590,7 @@ hash_put(dbp, key, data, flag) const DB *dbp; DBT *key; const DBT *data; - __uint32_t flag; + u_int flag; { HTAB *hashp; @@ -612,7 +612,7 @@ static int hash_delete(dbp, key, flag) const DB *dbp; const DBT *key; - __uint32_t flag; /* Ignored */ + u_int flag; /* Ignored */ { HTAB *hashp; @@ -764,7 +764,7 @@ static int hash_seq(dbp, key, data, flag) const DB *dbp; DBT *key, *data; - __uint32_t flag; + u_int flag; { __uint32_t bucket; BUFHEAD *bufp;