[PATCH] Fix "warning: cast to pointer from integer of different size"

[Ian Romanick]

On Wed, Feb 04, 2009 at 12:02:24AM +0100, Tomas Carnecky wrote:
> Add parenthesis around the whole expression.
> 
> Signed-off-by: Tomas Carnecky <tom at dbservice.com>
> ---
>  glx/indirect_dispatch.c      |    2 +-
>  glx/indirect_dispatch_swap.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

NAK.  These source files are program generated.  Didn't you see the
big comment at the top of the file?

/* DO NOT EDIT - This file generated automatically by glX_proto_recv.py (from Mesa) script */

Make the correction to the generator script.  Otherwise, the changes
will be lost the next time the generator script is run.

> diff --git a/glx/indirect_dispatch.c b/glx/indirect_dispatch.c
> index 6547f5d..6665519 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 0b8c27c..3221c80 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) );
> -- 
> 1.6.1.2
> 
> 
> _______________________________________________
> xorg mailing list
> xorg at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xorg
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20090204/3192f222/attachment.pgp>