From 00711022089936e08b8651591629ca344a3fa71e Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 7 Aug 2006 13:13:33 -0700
Subject: [PATCH] Add -Wwrite-strings compiler flag and fix all warnings

---
 configure.in             | 2 +-
 src/cairo-ps-surface.c   | 2 +-
 src/cairo-xlib-surface.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index cb2fa23c8..7e1b3e38b 100644
--- a/configure.in
+++ b/configure.in
@@ -535,7 +535,7 @@ WARN_CFLAGS=""
 if test "x$GCC" = "xyes"; then
 	WARN_CFLAGS="-Wall -Wsign-compare -Wpointer-arith -Wstrict-prototypes \
 	-Wmissing-prototypes -Wmissing-declarations \
-	-Wnested-externs -fno-strict-aliasing -Wold-style-definition"
+	-Wnested-externs -fno-strict-aliasing -Wold-style-definition -Wwrite-strings"
 fi
 
 AC_SUBST(WARN_CFLAGS)
diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index 37394a8ac..7de8c0800 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -1474,7 +1474,7 @@ static cairo_status_t
 emit_image (cairo_ps_surface_t    *surface,
 	    cairo_image_surface_t *image,
 	    cairo_matrix_t	  *matrix,
-	    char		  *name)
+	    const char		  *name)
 {
     cairo_status_t status;
     unsigned char *rgb, *compressed;
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 7e96e8735..5384a4ff2 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -934,7 +934,7 @@ static cairo_status_t
 _cairo_xlib_surface_set_filter (cairo_xlib_surface_t *surface,
 				cairo_filter_t	     filter)
 {
-    char *render_filter;
+    const char *render_filter;
 
     if (!surface->src_picture)
 	return CAIRO_STATUS_SUCCESS;
@@ -969,7 +969,7 @@ _cairo_xlib_surface_set_filter (cairo_xlib_surface_t *surface,
     }
 
     XRenderSetPictureFilter (surface->dpy, surface->src_picture,
-			     render_filter, NULL, 0);
+			     (char *) render_filter, NULL, 0);
 
     return CAIRO_STATUS_SUCCESS;
 }