Mesa (master): mesa: Make condrender.[ch] prototypes match.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Fri Jan 1 11:24:45 UTC 2010


Module: Mesa
Branch: master
Commit: 04c7f483b438deffe7cfa1883d0c30616257e2d0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=04c7f483b438deffe7cfa1883d0c30616257e2d0

Author: José Fonseca <jfonseca at vmware.com>
Date:   Fri Jan  1 11:20:38 2010 +0000

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.

---

 src/mesa/main/condrender.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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




More information about the mesa-commit mailing list