Merge branch 'mesa_7_6_branch'

Conflicts:

	src/mesa/drivers/windows/gdi/mesa.def

1 files changed, 5 insertions, 1 deletions

diff --git a/progs/tests/shader_api.c b/progs/tests/shader_api.c
index 6453856345c..fa0a992540c 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;