From 03615f7d837398790f88f7bd936a33a99e799af5 Mon Sep 17 00:00:00 2001
From: Chris Demetriou <cgd@google.com>
Date: Wed, 24 Mar 2010 17:10:47 -0700
Subject: ocale-archive differs between 32 and 64 bit platforms

---
 locale/programs/simple-hash.c | 2 ++
 locale/programs/simple-hash.h | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'locale/programs')

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;
 
-- 
cgit v1.1