aboutsummaryrefslogtreecommitdiff
path: root/pixman/test/utils.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-19 10:47:23 +0100
committermarha <marha@users.sourceforge.net>2012-11-19 10:47:23 +0100
commitb3e1e62c45f525cdd332073aaa34d8452cb23374 (patch)
tree221ee6420074033279921fadc971d30d63d6847b /pixman/test/utils.c
parentb142593315b909b9e202f0f4585b96bf2e74b9db (diff)
downloadvcxsrv-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/utils.c')
-rw-r--r--pixman/test/utils.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/pixman/test/utils.c b/pixman/test/utils.c
index 716bb7594..c887a6db9 100644
--- a/pixman/test/utils.c
+++ b/pixman/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;
@@ -694,6 +694,8 @@ get_random_seed (void)
return lcg_rand_u32 ();
}
+#ifdef HAVE_SIGACTION
+#ifdef HAVE_ALARM
static const char *global_msg;
static void
@@ -702,6 +704,8 @@ on_alarm (int signo)
printf ("%s\n", global_msg);
exit (1);
}
+#endif
+#endif
void
fail_after (int seconds, const char *msg)