summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-01-01 11:20:38 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-01-01 11:20:38 +0000
commit04c7f483b438deffe7cfa1883d0c30616257e2d0 (patch)
treebf0175381cd3330b975d7ed7d9b248433bc898ea
parent97e2c5ac0bba7298c9a32703fe3d19de1f7b815a (diff)
mesa: Make condrender.[ch] prototypes match.
GLAPI on windows is more than "extern" -- it includes the --, so the mismatch between condrender.[ch] prototypes causes "different linkage" errors on windows.
-rw-r--r--src/mesa/main/condrender.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c
index c292b8a04c..8d9a91d547 100644
--- a/src/mesa/main/condrender.c
+++ b/src/mesa/main/condrender.c
@@ -37,7 +37,7 @@
#include "queryobj.h"
-GLAPI void GLAPIENTRY
+void GLAPIENTRY
_mesa_BeginConditionalRender(GLuint queryId, GLenum mode)
{
struct gl_query_object *q;
@@ -84,7 +84,7 @@ _mesa_BeginConditionalRender(GLuint queryId, GLenum mode)
}
-GLAPI void APIENTRY
+void APIENTRY
_mesa_EndConditionalRender(void)
{
GET_CURRENT_CONTEXT(ctx);