fontconfig mesa pixman xserver git update 4 July 2014

xserver          commit a61ca6f006d70343c88fe45206fae0669d1e8971
pixman           commit 6d2cf40166d81bfc63108504c8022dc4fec37ff5
fontconfig       commit 5b22776999b6052afe0e829b1a0c0935bbe1e9f7
mesa             commit 9a37eb8adb6558a4abf47774b583cb582a0ae116

3 files changed, 8 insertions, 10 deletions

diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c
index 8506f5356..6c78928ee 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c
@@ -677,7 +677,7 @@ dri2ReleaseBuffer(__DRIscreen *screen, __DRIbuffer *buffer)
 
 
 static int
-dri2ConfigQueryb(__DRIscreen *screen, const char *var, bool *val)
+dri2ConfigQueryb(__DRIscreen *screen, const char *var, unsigned char *val)
 {
    if (!driCheckOption(&screen->optionCache, var, DRI_BOOL))
       return -1;
diff --git a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c b/mesalib/src/mesa/drivers/dri/common/xmlconfig.c
index 5091c115b..58d0e0656 100644
--- a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/mesalib/src/mesa/drivers/dri/common/xmlconfig.c
@@ -285,7 +285,7 @@ static float strToF (const XML_Char *string, const XML_Char **tail) {
 }
 
 /** \brief Parse a value of a given type. */
-static bool parseValue (driOptionValue *v, driOptionType type,
+static unsigned char parseValue (driOptionValue *v, driOptionType type,
 			     const XML_Char *string) {
     const XML_Char *tail = NULL;
   /* skip leading white-space */
@@ -328,7 +328,7 @@ static bool parseValue (driOptionValue *v, driOptionType type,
 }
 
 /** \brief Parse a list of ranges of type info->type. */
-static bool parseRanges (driOptionInfo *info, const XML_Char *string) {
+static unsigned char parseRanges (driOptionInfo *info, const XML_Char *string) {
     XML_Char *cp, *range;
     uint32_t nRanges, i;
     driOptionRange *ranges;
@@ -1003,13 +1003,13 @@ void driDestroyOptionCache (driOptionCache *cache) {
     free(cache->values);
 }
 
-bool driCheckOption (const driOptionCache *cache, const char *name,
+unsigned char driCheckOption (const driOptionCache *cache, const char *name,
 			  driOptionType type) {
     uint32_t i = findOption (cache, name);
     return cache->info[i].name != NULL && cache->info[i].type == type;
 }
 
-bool driQueryOptionb (const driOptionCache *cache, const char *name) {
+unsigned char driQueryOptionb (const driOptionCache *cache, const char *name) {
     uint32_t i = findOption (cache, name);
   /* make sure the option is defined and has the correct type */
     assert (cache->info[i].name != NULL);
diff --git a/mesalib/src/mesa/drivers/dri/common/xmlconfig.h b/mesalib/src/mesa/drivers/dri/common/xmlconfig.h
index 386ddf19d..af0323485 100644
--- a/mesalib/src/mesa/drivers/dri/common/xmlconfig.h
+++ b/mesalib/src/mesa/drivers/dri/common/xmlconfig.h
@@ -30,8 +30,6 @@
 #ifndef __XMLCONFIG_H
 #define __XMLCONFIG_H
 
-#include <stdbool.h>
-
 #define STRING_CONF_MAXLEN 25
 
 /** \brief Option data types */
@@ -41,7 +39,7 @@ typedef enum driOptionType {
 
 /** \brief Option value */
 typedef union driOptionValue {
-    bool _bool; /**< \brief Boolean */
+    unsigned char _bool; /**< \brief Boolean */
     int _int;      /**< \brief Integer or Enum */
     float _float;  /**< \brief Floating-point */
     char *_string;   /**< \brief String */
@@ -114,11 +112,11 @@ void driDestroyOptionInfo (driOptionCache *info);
 void driDestroyOptionCache (driOptionCache *cache);
 
 /** \brief Check if there exists a certain option */
-bool driCheckOption (const driOptionCache *cache, const char *name,
+unsigned char driCheckOption (const driOptionCache *cache, const char *name,
 			  driOptionType type);
 
 /** \brief Query a boolean option value */
-bool driQueryOptionb (const driOptionCache *cache, const char *name);
+unsigned char driQueryOptionb (const driOptionCache *cache, const char *name);
 /** \brief Query an integer option value */
 int driQueryOptioni (const driOptionCache *cache, const char *name);
 /** \brief Query a floating-point option value */