Mesa (master): mesa: Fix bool-int mismatch
Stephane Marchesin
marcheu at kemper.freedesktop.org
Tue Jun 12 22:24:30 UTC 2012
Module: Mesa
Branch: master
Commit: a74c4fb89dee398a955415f0b5641bd9c5888c75
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a74c4fb89dee398a955415f0b5641bd9c5888c75
Author: Stéphane Marchesin <marcheu at chromium.org>
Date: Tue Jun 12 15:11:21 2012 -0700
mesa: Fix bool-int mismatch
Also include stdbool for windows.
---
src/mesa/program/hash_table.h | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/mesa/program/hash_table.h b/src/mesa/program/hash_table.h
index a14bf13..e95fc49 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);
}
More information about the mesa-commit
mailing list