From 84e570d071a041f85e2e8b92963d3390d14af5fc Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 27 Aug 2013 10:17:25 +0200
Subject: fontconfig mesalib git update 27 aug 2013

fontconfig       commit c6228f8091ab91b67ea006ad5a1b1da97b3d4a5a
mesa             commit d8ac987f6ab228df1a478b36c3d889992754374f
---
 mesalib/src/mesa/main/macros.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mesalib/src/mesa/main')

diff --git a/mesalib/src/mesa/main/macros.h b/mesalib/src/mesa/main/macros.h
index ddfeee226..1052f7560 100644
--- a/mesalib/src/mesa/main/macros.h
+++ b/mesalib/src/mesa/main/macros.h
@@ -607,7 +607,8 @@ COPY_CLEAN_4V_TYPE_AS_FLOAT(GLfloat dst[4], int sz, const GLfloat src[4],
                      UINT_AS_FLT(0), UINT_AS_FLT(1));
       break;
    default:
-      ASSERT(0);
+      ASSIGN_4V(dst, 0.0f, 0.0f, 0.0f, 1.0f); /* silence warnings */
+      ASSERT(!"Unexpected type in COPY_CLEAN_4V_TYPE_AS_FLOAT macro");
    }
    COPY_SZ_4V(dst, sz, src);
 }
-- 
cgit v1.2.3