Skip to content

Commit

Permalink
ocale-archive differs between 32 and 64 bit platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Demetriou authored and Ulrich Drepper committed Mar 25, 2010
1 parent c8727fa commit 03615f7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 2 additions & 0 deletions locale/programs/simple-hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
# include <config.h>
#endif

#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion locale/programs/simple-hash.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#ifndef _SIMPLE_HASH_H
#define _SIMPLE_HASH_H

#include <inttypes.h>
#include <obstack.h>

typedef struct hash_table
Expand All @@ -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;

Expand Down

0 comments on commit 03615f7

Please sign in to comment.