From efcb63d0ce43f96d0ac02b6f4a480dfd2374fc84 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Thu, 23 Dec 2010 13:33:00 +0000
Subject: [PATCH] Render: Fix 'comparing between distinct pointer types'
 warning

Add the appropriate casts so that gcc shuts up, even if it doesn't
matter.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
---
 render/render.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/render/render.c b/render/render.c
index 0bbbae899..702955818 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1084,8 +1084,10 @@ ProcRenderAddGlyphs (ClientPtr client)
     remain -= (sizeof (CARD32) + sizeof (xGlyphInfo)) * nglyphs;
 
     /* protect against bad nglyphs */
-    if (gi < stuff || gi > ((CARD32 *)stuff + client->req_len) ||
-        bits < stuff || bits > ((CARD32 *)stuff + client->req_len)) {
+    if (gi < ((xGlyphInfo *)stuff) ||
+        gi > ((xGlyphInfo *)((CARD32 *)stuff + client->req_len)) ||
+        bits < ((CARD8 *)stuff) ||
+        bits > ((CARD8 *)((CARD32 *)stuff + client->req_len))) {
         err = BadLength;
         goto bail;
     }