Mesa (master): Make st_pipe_vertex_format return type in st_draw. h match st_draw.c

Alan Coopersmith alanc at kemper.freedesktop.org
Fri Apr 8 17:37:29 PDT 2011


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

Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Apr  8 16:48:12 2011 -0700

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 <alan.coopersmith at oracle.com>

---

 src/mesa/state_tracker/st_draw.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/state_tracker/st_draw.h b/src/mesa/state_tracker/st_draw.h
index 5d3c278..a7b50ce 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);
 



More information about the mesa-commit mailing list