From 6107705a40940e9050c13a6082abc94bde202c72 Mon Sep 17 00:00:00 2001
From: Gabriel Jacobo <gabomdq@gmail.com>
Date: Wed, 21 Aug 2013 10:34:32 -0300
Subject: [PATCH] Fix a couple of warnings

---
 src/video/SDL_fillrect.c     | 2 +-
 src/video/x11/SDL_x11shape.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/video/SDL_fillrect.c b/src/video/SDL_fillrect.c
index 72e2eefdebf68..d891e4e9d0531 100644
--- a/src/video/SDL_fillrect.c
+++ b/src/video/SDL_fillrect.c
@@ -274,7 +274,7 @@ static void
 SDL_FillRect2(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
 {
     int n;
-    Uint8 *p = NULL;
+    Uint16 *p = NULL;
     
     while (h--) {
         n = w;
diff --git a/src/video/x11/SDL_x11shape.c b/src/video/x11/SDL_x11shape.c
index d8ab18e928897..67eeade8a0570 100644
--- a/src/video/x11/SDL_x11shape.c
+++ b/src/video/x11/SDL_x11shape.c
@@ -90,7 +90,7 @@ int
 X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode) {
     SDL_ShapeData *data = NULL;
     SDL_WindowData *windowdata = NULL;
-    Pixmap shapemask = NULL;
+    Pixmap shapemask;
     
     if(shaper == NULL || shape == NULL || shaper->driverdata == NULL)
         return -1;