diff options
author | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
commit | b3e1e62c45f525cdd332073aaa34d8452cb23374 (patch) | |
tree | 221ee6420074033279921fadc971d30d63d6847b /pixman/test/glyph-test.c | |
parent | b142593315b909b9e202f0f4585b96bf2e74b9db (diff) | |
download | vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.gz vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.bz2 vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.zip |
git update 19 nov 2012
fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d
libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e
mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe
pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7
xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea
xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
Diffstat (limited to 'pixman/test/glyph-test.c')
-rw-r--r-- | pixman/test/glyph-test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pixman/test/glyph-test.c b/pixman/test/glyph-test.c index 9dd5b41e4..501cc2e6f 100644 --- a/pixman/test/glyph-test.c +++ b/pixman/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 |