Re: [Mesa-dev] [PATCH] Make st_pipe_vertex_format return type in st_draw.h match st_draw.c

[Brian Paul]

On 04/08/2011 06:02 PM, Alan Coopersmith wrote:

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.coopersm...@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);

Looks good.

-Brian

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev