From a74c4fb89dee398a955415f0b5641bd9c5888c75 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Marchesin?= Date: Tue, 12 Jun 2012 15:11:21 -0700 Subject: [PATCH] mesa: Fix bool-int mismatch Also include stdbool for windows. --- src/mesa/program/hash_table.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 +#include #include #include #include @@ -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); } -- 2.30.2