diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-03-28 11:34:03 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-03-28 11:34:03 +0000 |
| commit | e892b789c4c6359e4fb2e11f552b3e43a466c49e (patch) | |
| tree | 6bc2d17080eb4231b0d05741b9562b8196540fa3 | |
| parent | 5c0623b5f36cd1a1a2e3280ab2bea35a7899281b (diff) | |
sna: Suppress a compiler warning
sna_display.c: In function '__sna_get_cursor':
sna_display.c:3153:6: warning: assignment from incompatible pointer type [enabled by default]
src = sna->cursor.ref->bits->argb;
^
sna_display.c:3209:10: warning: comparison of distinct pointer types lacks a cast [enabled by default]
if (src != sna->cursor.ref->bits->argb)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 8d271fdb..b7f423d9 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -3150,7 +3150,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc) width = sna->cursor.ref->bits->width; height = sna->cursor.ref->bits->height; - src = sna->cursor.ref->bits->argb; + src = (uint32_t *)sna->cursor.ref->bits->argb; if (src == NULL) { const uint8_t *source = sna->cursor.ref->bits->source; const uint8_t *mask = sna->cursor.ref->bits->mask; @@ -3206,7 +3206,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc) } } - if (src != sna->cursor.ref->bits->argb) + if (src != (uint32_t *)sna->cursor.ref->bits->argb) free(src); cursor->size = size; |