diff options
| author | Stefan Weil <sw@weilnetz.de> | 2012-11-13 19:38:32 +0100 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@redhat.com> | 2012-11-14 18:02:14 -0500 |
| commit | 5f96022d3bca15050958512f1c15a0067d2225af (patch) | |
| tree | 4cb8c632b1d9aa32fd7a369436e04a8e776e96f9 /test | |
| parent | a96efd02d68b726d6d140d0bd211bc7cc1be127a (diff) | |
pixman: Use uintptr_t in type casts from pointer to integral value
These modifications fix lots of compiler warnings for systems where
sizeof(unsigned long) != sizeof(void *).
This is especially true for MinGW-w64 (64 bit Windows).
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Diffstat (limited to 'test')
| -rw-r--r-- | test/glyph-test.c | 4 | ||||
| -rw-r--r-- | test/utils.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/glyph-test.c b/test/glyph-test.c index 9dd5b41..501cc2e 100644 --- a/test/glyph-test.c +++ b/test/glyph-test.c @@ -215,8 +215,8 @@ create_image (int max_size, const pixman_format_code_t *formats, uint32_t flags) return image; } -#define KEY1(p) ((void *)(((unsigned long)p) ^ (0xa7e23dfaUL))) -#define KEY2(p) ((void *)(((unsigned long)p) ^ (0xabcd9876UL))) +#define KEY1(p) ((void *)(((uintptr_t)p) ^ (0xa7e23dfaUL))) +#define KEY2(p) ((void *)(((uintptr_t)p) ^ (0xabcd9876UL))) #define MAX_GLYPHS 32 diff --git a/test/utils.c b/test/utils.c index 716bb75..ef0a171 100644 --- a/test/utils.c +++ b/test/utils.c @@ -377,7 +377,7 @@ fence_malloc (int64_t len) return NULL; } - initial_page = (uint8_t *)(((unsigned long)addr + page_mask) & ~page_mask); + initial_page = (uint8_t *)(((uintptr_t)addr + page_mask) & ~page_mask); leading_protected = initial_page + page_size; payload = leading_protected + N_LEADING_PROTECTED * page_size; trailing_protected = payload + n_payload_bytes; |