From: Stéphane Marchesin <marcheu@chromium.org>
Date: Tue, 12 Jun 2012 22:11:21 +0000 (-0700)
Subject: mesa: Fix bool-int mismatch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a74c4fb89dee398a955415f0b5641bd9c5888c75;p=mesa.git

mesa: Fix bool-int mismatch

Also include stdbool for windows.
---

diff --git a/src/mesa/program/hash_table.h b/src/mesa/program/hash_table.h
index a14bf13d1bd..e95fc4982ec 100644
--- a/src/mesa/program/hash_table.h
+++ b/src/mesa/program/hash_table.h
@@ -32,6 +32,7 @@
 #define HASH_TABLE_H
 
 #include <string.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <limits.h>
@@ -125,7 +126,7 @@ extern void hash_table_insert(struct hash_table *ht, void *data,
  *
  * \sa hash_table_insert
  */
-extern int hash_table_replace(struct hash_table *ht, void *data,
+extern bool hash_table_replace(struct hash_table *ht, void *data,
     const void *key);
 
 /**
@@ -264,9 +265,9 @@ public:
        */
       assert(value != UINT_MAX);
       char *dup_key = strdup(key);
-      int result = hash_table_replace(this->ht,
-				      (void *) (intptr_t) (value + 1),
-				      dup_key);
+      bool result = hash_table_replace(this->ht,
+				       (void *) (intptr_t) (value + 1),
+				       dup_key);
       if (result)
 	 free(dup_key);
    }