diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-10 14:42:02 -0700 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-10 14:42:02 -0700 |
commit | 59cc9739400c3a1654c069586070ff218993cd37 (patch) | |
tree | 500235cc5fa74a436bcd59cd705e5eaae69902aa /src/mesa/main | |
parent | 13f96c5401ffe3869f08fecb2baf5bff2438b02e (diff) |
mesa: fix some misc breakage caused by editing auto-generated files rather than the python generators
Specifically:
#include "glapitable.h" in src/mesa/main/glapi/dispatch.h
Call _mesa_bsearch() in src/mesa/main/enums.c.
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/enums.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c index a9c102e4f2..4796f3027a 100644 --- a/src/mesa/main/enums.c +++ b/src/mesa/main/enums.c @@ -4866,8 +4866,10 @@ const char *_mesa_lookup_enum_by_nr( int nr ) { unsigned * i; - i = (unsigned *)bsearch( & nr, reduced_enums, Elements(reduced_enums), - sizeof(reduced_enums[0]), (cfunc) compar_nr ); + i = (unsigned *) _mesa_bsearch(& nr, reduced_enums, + Elements(reduced_enums), + sizeof(reduced_enums[0]), + (cfunc) compar_nr); if ( i != NULL ) { return & enum_string_table[ all_enums[ *i ].offset ]; @@ -4884,8 +4886,10 @@ int _mesa_lookup_enum_by_name( const char *symbol ) enum_elt * f = NULL; if ( symbol != NULL ) { - f = (enum_elt *)bsearch( symbol, all_enums, Elements(all_enums), - sizeof( enum_elt ), (cfunc) compar_name ); + f = (enum_elt *) _mesa_bsearch(symbol, all_enums, + Elements(all_enums), + sizeof( enum_elt ), + (cfunc) compar_name); } return (f != NULL) ? f->n : -1; |