ocale-archive differs between 32 and 64 bit platforms

diff --git a/ChangeLog b/ChangeLog
index d3cd548f5b49405e49a74d5119b2e5e56b9d6384..08db0200609373ea20f69040aa3eb21edb2e07ed 100644 (file)
--- 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 5bd65f247834ba66993ec173d5db0efe94077fd3..b9cc237e49d786db2ea12cd5ece311000e3fd271 100644 (file)
--- 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 b41c233b064f1bc053c1910983fc2c7b7a74c0b9..e0c32bcc34339bccddaaced865d788a680182849 100644 (file)
--- 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;