diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-16 08:59:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-16 08:59:33 +0200 |
| commit | d00d82f6017166fdeb927320ce4c656cb99319fd (patch) | |
| tree | 75d388ec743971c4bdcc85b639f8bc35458b27e0 /mesalib/src/mesa/main/hash_table.c | |
| parent | 707c146a74f6ff862be3ebb2470d1f31e29dd907 (diff) | |
| parent | 06f4de23ace4de1fd628c37891214f0a4ecb77db (diff) | |
| download | vcxsrv-d00d82f6017166fdeb927320ce4c656cb99319fd.tar.gz vcxsrv-d00d82f6017166fdeb927320ce4c656cb99319fd.tar.bz2 vcxsrv-d00d82f6017166fdeb927320ce4c656cb99319fd.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb xcb-proto mesa xkbcomp git update 16 Jul 2013
Conflicts:
mesalib/src/glsl/glsl_symbol_table.cpp
Diffstat (limited to 'mesalib/src/mesa/main/hash_table.c')
| -rw-r--r-- | mesalib/src/mesa/main/hash_table.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/hash_table.c b/mesalib/src/mesa/main/hash_table.c index af0510da1..008b4cdbc 100644 --- a/mesalib/src/mesa/main/hash_table.c +++ b/mesalib/src/mesa/main/hash_table.c @@ -110,8 +110,8 @@ entry_is_present(const struct hash_table *ht, struct hash_entry *entry) struct hash_table * _mesa_hash_table_create(void *mem_ctx, - bool key_equals_function(const void *a, - const void *b)) + bool (*key_equals_function)(const void *a, + const void *b)) { struct hash_table *ht; |