diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
| commit | 953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch) | |
| tree | 9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /libihash | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'libihash')
| -rw-r--r-- | libihash/Makefile | 4 | ||||
| -rw-r--r-- | libihash/ihash.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libihash/Makefile b/libihash/Makefile index e0258241..09bb1362 100644 --- a/libihash/Makefile +++ b/libihash/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1995, 1996, 2001, 2003 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 2001, 2003, 2012 Free Software Foundation, Inc. # # This file is part of the GNU Hurd. # @@ -23,7 +22,6 @@ makemode := library libname := libihash SRCS = ihash.c installhdrs = ihash.h -LCLHDRS = $(installhdrs) OBJS = $(SRCS:.c=.o) diff --git a/libihash/ihash.c b/libihash/ihash.c index 05d53ced..fe9eaedf 100644 --- a/libihash/ihash.c +++ b/libihash/ihash.c @@ -349,7 +349,7 @@ hurd_ihash_add (hurd_ihash_t ht, hurd_ihash_key_t key, hurd_ihash_value_t item) { struct hurd_ihash old_ht = *ht; int was_added; - int i; + unsigned int i; if (ht->size) { |