projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
97e2c5a
)
mesa: Make condrender.[ch] prototypes match.
author
José Fonseca
<jfonseca@vmware.com>
Fri, 1 Jan 2010 11:20:38 +0000
(11:20 +0000)
committer
José Fonseca
<jfonseca@vmware.com>
Fri, 1 Jan 2010 11:20:38 +0000
(11:20 +0000)
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
patch
|
blob
|
history
diff --git
a/src/mesa/main/condrender.c
b/src/mesa/main/condrender.c
index c292b8a04c53dd44a8e05ecb6cdca7e38aad7db8..8d9a91d5478011d02d9f03e32fe5df4fefc4d066 100644
(file)
--- 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);