* 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.
With review from Bruno Haible <br...@clisp.org>.
---
ChangeLog | 9 +++++++++
lib/malloca.c | 6 ++++--
modules/malloca | 1 +
modules/relocatable-prog-wrapper | 1 +
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a0ce8a1..575fee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-24 Marc-André Lureau <marcandre.lur...@redhat.com>
+
+ 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.
+ With review from Bruno Haible <br...@clisp.org>.
+
2012-01-24 Bruno Haible <br...@clisp.org>
havelib: Modern quoting.
diff --git a/lib/malloca.c b/lib/malloca.c
index c81ffbc..4557a90 100644
--- 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 @@ mmalloca (size_t n)
((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 @@ freea (void *p)
{
/* 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;)
{
diff --git a/modules/malloca b/modules/malloca
index 57cbe32..bb9e9b4 100644
--- a/modules/malloca
+++ b/modules/malloca
@@ -11,6 +11,7 @@ m4/longlong.m4
Depends-on:
alloca-opt
+stdint
verify
configure.ac:
diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper
index 8ff11d4..e5dccd5 100644
--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -39,6 +39,7 @@ errno
pathmax
ssize_t
stdbool
+stdint
stdlib
unistd
environ
--
1.7.7.5
