Mesa (mesa_7_6_branch): progs/tests: Fix MSVC build.

Brian Paul brianp at kemper.freedesktop.org
Wed Nov 4 14:56:31 PST 2009


Module: Mesa
Branch: mesa_7_6_branch
Commit: 60c328db2d5f269267dac7cd64335ba005890fca
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=60c328db2d5f269267dac7cd64335ba005890fca

Author: Vinson Lee <vlee at vmware.com>
Date:   Wed Nov  4 15:55:39 2009 -0700

progs/tests: Fix MSVC build.

Signed-off-by: Brian Paul <brianp at vmware.com>

---

 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;
 



More information about the mesa-commit mailing list