From dd3f4e829286e62f4c5c07ee93f9f576876acbf9 Mon Sep 17 00:00:00 2001 From: Tomas Carnecky Date: Wed, 4 Feb 2009 00:02:24 +0100 Subject: [PATCH] Fix "warning: cast to pointer from integer of different size" Add parenthesis around the whole expression. Signed-off-by: Tomas Carnecky Signed-off-by: Peter Hutterer --- glx/indirect_dispatch.c | 2 +- glx/indirect_dispatch_swap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glx/indirect_dispatch.c b/glx/indirect_dispatch.c index 6547f5d96..666551903 100644 --- a/glx/indirect_dispatch.c +++ b/glx/indirect_dispatch.c @@ -3743,7 +3743,7 @@ void __glXDisp_ResetMinmax(GLbyte * pc) void __glXDisp_TexImage3D(GLbyte * pc) { const CARD32 ptr_is_null = *(CARD32 *)(pc + 76); - const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 80); + const GLvoid * const pixels = (const GLvoid *) ((ptr_is_null != 0) ? NULL : (pc + 80)); __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); diff --git a/glx/indirect_dispatch_swap.c b/glx/indirect_dispatch_swap.c index 0b8c27cac..3221c809d 100644 --- a/glx/indirect_dispatch_swap.c +++ b/glx/indirect_dispatch_swap.c @@ -3879,7 +3879,7 @@ void __glXDispSwap_ResetMinmax(GLbyte * pc) void __glXDispSwap_TexImage3D(GLbyte * pc) { const CARD32 ptr_is_null = *(CARD32 *)(pc + 76); - const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 80); + const GLvoid * const pixels = (const GLvoid *) ((ptr_is_null != 0) ? NULL : (pc + 80)); __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );