OSDN Git Service

Make st_pipe_vertex_format return type in st_draw.h match st_draw.c
authorAlan Coopersmith <alan.coopersmith@oracle.com>
Fri, 8 Apr 2011 23:48:12 +0000 (16:48 -0700)
committerAlan Coopersmith <alan.coopersmith@oracle.com>
Sat, 9 Apr 2011 00:36:46 +0000 (17:36 -0700)
Fixes compiler error from Sun compilers:
"state_tracker/st_draw.c", line 185: identifier redeclared: st_pipe_vertex_format
        current : function(unsigned int, unsigned int, unsigned int, unsigned char) returning enum pipe_format
        previous: function(unsigned int, unsigned int, unsigned int, unsigned char) returning unsigned int : "state_tracker/st_draw.h", line 73

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
src/mesa/state_tracker/st_draw.h

index 5d3c278..a7b50ce 100644 (file)
@@ -69,7 +69,7 @@ st_feedback_draw_vbo(struct gl_context *ctx,
 
 /* Internal function:
  */
-extern GLuint
+extern enum pipe_format
 st_pipe_vertex_format(GLenum type, GLuint size, GLenum format,
                       GLboolean normalized);