Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16312:2afce32badc0
malloca: Avoid warnings on x86_64 mingw64.
* lib/malloca.c: Include <stdint.h>.
(mmalloca, freea): Use uintptr_t to convert pointers to integers.
* modules/malloca (Depends-on): Add stdint.
* modules/relocatable-prog-wrapper (Depends-on): Likewise.
| author | Marc-André Lureau <marcandre.lureau@redhat.com> |
|---|---|
| date | Tue, 24 Jan 2012 13:21:56 +0100 |
| parents | ca5972990d4f |
| children | 8b91748dde8f |
| files | ChangeLog lib/malloca.c modules/malloca modules/relocatable-prog-wrapper |
| diffstat | 4 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-01-24 Marc-André Lureau <marcandre.lureau@redhat.com> (tiny change) + Bruno Haible <bruno@clisp.org> + + malloca: Avoid warnings on x86_64 mingw64. + * lib/malloca.c: Include <stdint.h>. + (mmalloca, freea): Use uintptr_t to convert pointers to integers. + * modules/malloca (Depends-on): Add stdint. + * modules/relocatable-prog-wrapper (Depends-on): Likewise. + 2012-01-25 Paul Eggert <eggert@cs.ucla.edu> obstack: remove __STDC__ conditionals
--- a/lib/malloca.c +++ b/lib/malloca.c @@ -22,6 +22,8 @@ /* Specification. */ #include "malloca.h" +#include <stdint.h> + #include "verify.h" /* The speed critical point in this file is freea() applied to an alloca() @@ -85,7 +87,7 @@ ((int *) p)[-1] = MAGIC_NUMBER; /* Enter p into the hash table. */ - slot = (unsigned long) p % HASH_TABLE_SIZE; + slot = (uintptr_t) p % HASH_TABLE_SIZE; ((struct header *) (p - HEADER_SIZE))->next = mmalloca_results[slot]; mmalloca_results[slot] = p; @@ -118,7 +120,7 @@ { /* Looks like a mmalloca() result. To see whether it really is one, perform a lookup in the hash table. */ - size_t slot = (unsigned long) p % HASH_TABLE_SIZE; + size_t slot = (uintptr_t) p % HASH_TABLE_SIZE; void **chain = &mmalloca_results[slot]; for (; *chain != NULL;) {