From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 1 Jan 2010 11:20:38 +0000 (+0000)
Subject: mesa: Make condrender.[ch] prototypes match.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=04c7f483b438deffe7cfa1883d0c30616257e2d0;p=mesa.git

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.
---

diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c
index c292b8a04c5..8d9a91d5478 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);