diff options
author | Nian Wu <nian@graphics.(none)> | 2007-02-25 09:40:28 -0800 |
---|---|---|
committer | Nian Wu <nian@graphics.(none)> | 2007-02-25 09:40:28 -0800 |
commit | 675f7f627bec92315bf168a9c872ffc05f88c69c (patch) | |
tree | 19c8f9cc509dc7ce73a0709832f34bf13a2c7425 /src/mesa/glapi/glapitable.h | |
parent | 51bfb8fc8c78bb066d24e6ecbc20f00af7210386 (diff) | |
parent | c080123998f28d9317331aec7ddfcd1074b29daf (diff) |
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
Diffstat (limited to 'src/mesa/glapi/glapitable.h')
-rw-r--r-- | src/mesa/glapi/glapitable.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h index 026af32af8..4af0c2d43b 100644 --- a/src/mesa/glapi/glapitable.h +++ b/src/mesa/glapi/glapitable.h @@ -30,7 +30,11 @@ # define _GLAPI_TABLE_H_ #ifndef GLAPIENTRYP -#define GLAPIENTRYP +# ifndef GLAPIENTRY +# define GLAPIENTRY +# endif + +# define GLAPIENTRYP GLAPIENTRY * #endif typedef void (*_glapi_proc)(void); /* generic function pointer */ @@ -704,7 +708,7 @@ struct _glapi_table void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 664 */ void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 665 */ void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 666 */ - void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** params); /* 667 */ + void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 667 */ void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 668 */ void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 669 */ void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 670 */ |