summaryrefslogtreecommitdiff
path: root/glx
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2009-10-08 13:38:44 +1100
committerDaniel Stone <daniel@fooishbar.org>2009-10-08 13:38:44 +1100
commitb0dd6be2c8703f7062d45ac9fd646550c7d54e3b (patch)
tree98c7ac7a8d90fea6fcdd44525fc42e84d0cb4914 /glx
parentb680a89262efcfef4644adb4a61ae42ea0db0c93 (diff)
Cast small-int values through intptr_t when passed as pointers
On 64-bit systems, int and pointers don't have the same size, so GCC gives warnings about casts between int and pointer types. However, in the cases covered by this patch, it's always a value that fits in int being stored temporarily as a pointer and then converted back later, which is safe. Casting through the pointer-sized integer type intptr_t convinces the compiler that this is OK. Signed-off-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'glx')
-rw-r--r--glx/glxcmds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index ba4c12398..eedab652f 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -2057,7 +2057,7 @@ int __glXDisp_BindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc)
if (ret == Success) {
if (barrier)
/* add source for cleanup when drawable is gone */
- AddResource(drawable, __glXSwapBarrierRes, (pointer)screen);
+ AddResource(drawable, __glXSwapBarrierRes, (pointer)(intptr_t)screen);
else
/* delete source */
FreeResourceByType(drawable, __glXSwapBarrierRes, FALSE);