Mesa (master): glapi: Move declaration before code.

Vinson Lee vlee at kemper.freedesktop.org
Mon Sep 23 21:15:29 UTC 2013


Module: Mesa
Branch: master
Commit: f036d55515bc2b3821d52d16f2211d6c2e21b9a2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f036d55515bc2b3821d52d16f2211d6c2e21b9a2

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Mon Sep 23 14:07:15 2013 -0700

glapi: Move declaration before code.

This patch fixes the MSVC build error introduced by commit
673129e0b936b1c748e988d3f74f3efaab9e5693.

enums.c
mesa\main\enums.c(3776) : error C2143: syntax error : missing ';' before 'type'
mesa\main\enums.c(3781) : error C2065: 'elt' : undeclared identifier
mesa\main\enums.c(3781) : warning C4047: '!=' : 'int' differs in levels of indirection from 'void *'
mesa\main\enums.c(3782) : error C2065: 'elt' : undeclared identifier
mesa\main\enums.c(3782) : error C2223: left of '->offset' must point to struct/union
mesa\main\enums.c(3782) : warning C4033: '_mesa_lookup_enum_by_nr' must return a value

Signed-off-by: Vinson Lee <vlee at freedesktop.org>

---

 src/mapi/glapi/gen/gl_enums.py |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mapi/glapi/gen/gl_enums.py b/src/mapi/glapi/gen/gl_enums.py
index a0c47f4..0214932 100644
--- a/src/mapi/glapi/gen/gl_enums.py
+++ b/src/mapi/glapi/gen/gl_enums.py
@@ -78,12 +78,14 @@ static char token_tmp[20];
 
 const char *_mesa_lookup_enum_by_nr( int nr )
 {
+   enum_elt *elt;
+
    STATIC_ASSERT(sizeof(enum_string_table) < (1 << 16));
 
-   enum_elt *elt = _mesa_bsearch(& nr, enum_string_table_offsets,
-                                 Elements(enum_string_table_offsets),
-                                 sizeof(enum_string_table_offsets[0]),
-                                 (cfunc) compar_nr);
+   elt = _mesa_bsearch(& nr, enum_string_table_offsets,
+                       Elements(enum_string_table_offsets),
+                       sizeof(enum_string_table_offsets[0]),
+                       (cfunc) compar_nr);
 
    if (elt != NULL) {
       return &enum_string_table[elt->offset];




More information about the mesa-commit mailing list