aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Demetriou <cgd@google.com>2010-03-24 17:10:47 -0700
committerUlrich Drepper <drepper@redhat.com>2010-03-24 17:10:47 -0700
commit03615f7d837398790f88f7bd936a33a99e799af5 (patch)
treecfd01629ca4e1d26cfbb8ccc5485a6190831b3ba
parentc8727fa6e5073d28ed6d0eb40a006ac2c1b9f9f3 (diff)
downloadglibc-03615f7d837398790f88f7bd936a33a99e799af5.zip
glibc-03615f7d837398790f88f7bd936a33a99e799af5.tar.gz
glibc-03615f7d837398790f88f7bd936a33a99e799af5.tar.bz2
ocale-archive differs between 32 and 64 bit platforms
-rw-r--r--ChangeLog7
-rw-r--r--locale/programs/simple-hash.c2
-rw-r--r--locale/programs/simple-hash.h3
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d3cd548..08db020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-16 Chris Demetriou <cgd@google.com>
+
+ * locale/programs/simple-hash.c: Include inttypes.h.
+ (hashval_t): Defined to be uint32_t.
+ * locale/programs/simple_hash.h: Include inttypes.h.
+ (compute_hashval): Change return type to uint32_t.
+
2010-03-24 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/getlogin_r.c: New file.
diff --git a/locale/programs/simple-hash.c b/locale/programs/simple-hash.c
index 5bd65f2..b9cc237 100644
--- a/locale/programs/simple-hash.c
+++ b/locale/programs/simple-hash.c
@@ -21,6 +21,7 @@
# include <config.h>
#endif
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -49,6 +50,7 @@
# define bcopy(s, d, n) memcpy ((d), (s), (n))
#endif
+#define hashval_t uint32_t
#include "hashval.h"
extern void *xmalloc (size_t __n);
diff --git a/locale/programs/simple-hash.h b/locale/programs/simple-hash.h
index b41c233..e0c32bc 100644
--- a/locale/programs/simple-hash.h
+++ b/locale/programs/simple-hash.h
@@ -19,6 +19,7 @@
#ifndef _SIMPLE_HASH_H
#define _SIMPLE_HASH_H
+#include <inttypes.h>
#include <obstack.h>
typedef struct hash_table
@@ -45,7 +46,7 @@ extern int iterate_table (const hash_table *htab, void **ptr,
const void **key, size_t *keylen, void **data)
__THROW;
-extern unsigned long int compute_hashval (const void *key, size_t keylen)
+extern uint32_t compute_hashval (const void *key, size_t keylen)
__THROW;
extern unsigned long int next_prime (unsigned long int seed) __THROW;