From: Alan Coopersmith Date: Fri, 8 Apr 2011 23:48:12 +0000 (-0700) Subject: Make st_pipe_vertex_format return type in st_draw.h match st_draw.c X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d27ff8c5cd22ac0279948d3df4b3384eef866cde;p=mesa.git Make st_pipe_vertex_format return type in st_draw.h match st_draw.c 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 --- diff --git a/src/mesa/state_tracker/st_draw.h b/src/mesa/state_tracker/st_draw.h index 5d3c278228f..a7b50ce977a 100644 --- a/src/mesa/state_tracker/st_draw.h +++ b/src/mesa/state_tracker/st_draw.h @@ -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);