diff options
author | Brian Paul <brianp@vmware.com> | 2009-11-04 17:57:20 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-11-04 17:57:20 -0700 |
commit | 898de4a9d5e47ed32c600e5907476fd9338aa7e9 (patch) | |
tree | b06ee62e20bbf0cc5dbfd55b8315c4c409eb45ec /progs/tests | |
parent | fe86f8d73268785b31bc8d5a278a233bff42034d (diff) | |
parent | 1c3f7ab74ce492d6c92f2e3a0f29957fa9a71d96 (diff) | |
download | external_mesa3d-898de4a9d5e47ed32c600e5907476fd9338aa7e9.zip external_mesa3d-898de4a9d5e47ed32c600e5907476fd9338aa7e9.tar.gz external_mesa3d-898de4a9d5e47ed32c600e5907476fd9338aa7e9.tar.bz2 |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/drivers/windows/gdi/mesa.def
Diffstat (limited to 'progs/tests')
-rw-r--r-- | progs/tests/shader_api.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/progs/tests/shader_api.c b/progs/tests/shader_api.c index 6453856..fa0a992 100644 --- a/progs/tests/shader_api.c +++ b/progs/tests/shader_api.c @@ -8,6 +8,10 @@ #include <GL/glew.h> #include <GL/glut.h> +#ifndef APIENTRY +#define APIENTRY +#endif + static void assert_test(const char *file, int line, int cond, const char *msg) { if (!cond) @@ -42,7 +46,7 @@ static void assert_error_test(const char *file, int line, GLenum expect) #define assert_error(err) assert_error_test(__FILE__, __LINE__, (err)) -static void check_status(GLuint id, GLenum pname, void (*query)(GLuint, GLenum, GLint *)) +static void check_status(GLuint id, GLenum pname, void (APIENTRY *query)(GLuint, GLenum, GLint *)) { GLint status; |