Since removing PTR_DECL_IN_FRONT it's no longer needed. Just use "_ASMAPI *" instead. --- src/mesa/main/compiler.h | 1 - src/mesa/math/m_xform.h | 6 +++--- src/mesa/swrast/s_context.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 7cd7947..1e97b4c 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -124,7 +124,6 @@ extern "C" { #else #define _ASMAPI #endif -#define _ASMAPIP _ASMAPI * #endif diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h index 3ac2211..3ebe742 100644 --- a/src/mesa/math/m_xform.h +++ b/src/mesa/math/m_xform.h @@ -91,7 +91,7 @@ init_c_cliptest(void); #define CLIP_FRUSTUM_BITS 0x3f -typedef GLvector4f * (_ASMAPIP clip_func)( GLvector4f *vClip, +typedef GLvector4f * (_ASMAPI *clip_func)( GLvector4f *vClip, GLvector4f *vProj, GLubyte clipMask[], GLubyte *orMask, @@ -111,7 +111,7 @@ typedef void (*vec_copy_func)( GLvector4f *to, /* * Functions for transformation of normals in the VB. */ -typedef void (_ASMAPIP normal_func)( const GLmatrix *mat, +typedef void (_ASMAPI *normal_func)( const GLmatrix *mat, GLfloat scale, const GLvector4f *in, const GLfloat lengths[], @@ -133,7 +133,7 @@ typedef void (_ASMAPIP normal_func)( const GLmatrix *mat, * when the mask byte is zero. This is always present as a * parameter, to allow a unified interface. */ -typedef void (_ASMAPIP transform_func)( GLvector4f *to_vec, +typedef void (_ASMAPI *transform_func)( GLvector4f *to_vec, const GLfloat m[16], const GLvector4f *from_vec ); diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h index d6fbc5d5..6c46b27 100644 --- a/src/mesa/swrast/s_context.h +++ b/src/mesa/swrast/s_context.h @@ -58,7 +58,7 @@ typedef void (*texture_sample_func)(struct gl_context *ctx, GLuint n, const GLfloat texcoords[][4], const GLfloat lambda[], GLfloat rgba[][4]); -typedef void (_ASMAPIP blend_func)( struct gl_context *ctx, GLuint n, +typedef void (_ASMAPI *blend_func)( struct gl_context *ctx, GLuint n, const GLubyte mask[], GLvoid *src, const GLvoid *dst, GLenum chanType); -- 1.9.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev