[Spice-commits] 2 commits - configure.ac GITVERSION server/red_worker.c

[Alexander Larsson]

 configure.ac        |   16 +++++++++++++++-
 server/red_worker.c |    4 ++--
 2 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit bc5c34584168d0c6c0d1b9b49c2344f8c12c63b1
Author: Alexander Larsson <alexl at redhat.com>
Date:   Fri Jul 9 12:14:32 2010 +0200

    Add --enable-werror and make it the default only for git builds
    
    Its not generally a good idea to have released tarballs build with
    -Werror, as later compilers may add warnings breaking old releases, etc.

diff --git a/GITVERSION b/GITVERSION
new file mode 100644
index 0000000..e69de29
diff --git a/configure.ac b/configure.ac
index 8033252..6b70329 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,7 +272,18 @@ dnl MAYBE_WARN in an ignorable way (like adding whitespace)
 
 dnl MAYBE_WARN="-Wall -Wno-sign-compare -Werror -Wno-deprecated-declarations"
 
-MAYBE_WARN="-Wall -Wno-sign-compare -Werror -Wno-deprecated-declarations"
+MAYBE_WARN="-Wall -Wno-sign-compare -Wno-deprecated-declarations"
+
+AC_ARG_ENABLE(werror,
+AC_HELP_STRING([--enable-werror], [Use -Werror (if supported)]),
+set_werror="$enableval",[
+if test -f $srcdir/GITVERSION; then
+	is_git_version=true
+	set_werror=yes
+else
+	set_werror=no
+fi
+])
 
 
 # invalidate cached value if MAYBE_WARN has changed
@@ -297,6 +308,9 @@ AC_CACHE_CHECK([for supported warning flags], spice_cv_warn_cflags, [
 	for W in $MAYBE_WARN; do
 		SPICE_CC_TRY_FLAG([$W], [WARN_CFLAGS="$WARN_CFLAGS $W"])
 	done
+	if test "$set_werror" != "no"; then
+		SPICE_CC_TRY_FLAG(["-Werror"], [WARN_CFLAGS="$WARN_CFLAGS -Werror"])
+	fi
 
 	spice_cv_warn_cflags=$WARN_CFLAGS
 	spice_cv_warn_maybe=$MAYBE_WARN
commit 1d119d527ea14e115ef86fc7a98dd7cc69024b69
Author: Alexander Larsson <alexl at redhat.com>
Date:   Fri Jul 9 12:02:15 2010 +0200

    Use the right enum types for bitmap_data.type comparisons

diff --git a/server/red_worker.c b/server/red_worker.c
index 786387f..9a98750 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -6957,8 +6957,8 @@ static void red_lossy_send_qxl_draw_opaque(RedWorker *worker,
                                        &src_bitmap_data);
     }
 
-    if (!(brush_is_lossy && (brush_bitmap_data.type == SPICE_IMAGE_TYPE_SURFACE)) &&
-        !(src_is_lossy && (src_bitmap_data.type == SPICE_IMAGE_TYPE_SURFACE))) {
+    if (!(brush_is_lossy && (brush_bitmap_data.type == BITMAP_DATA_TYPE_SURFACE)) &&
+        !(src_is_lossy && (src_bitmap_data.type == BITMAP_DATA_TYPE_SURFACE))) {
         FillBitsType src_send_type;
         int has_mask = !!drawable->u.opaque.mask.bitmap;