summaryrefslogtreecommitdiffstats
path: root/src/mesa/glapi
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2010-03-25 16:12:01 -0600
committerBrian Paul <[email protected]>2010-03-25 16:12:01 -0600
commita6fecdff3e71f080d4caf29d2b0713ab5ce9d5f4 (patch)
treec0008c909e6ef0e25b62ef92b77061c955f85836 /src/mesa/glapi
parent8814bb652aa0deee7fa34c0746ba9dc63163b88d (diff)
parent59258498dc6fa51573b176d071644bd3e750b5ac (diff)
Merge branch '7.8'
Diffstat (limited to 'src/mesa/glapi')
-rw-r--r--src/mesa/glapi/glapi_nop.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/glapi/glapi_nop.c b/src/mesa/glapi/glapi_nop.c
index b1a718a5f0a..df9c5872842 100644
--- a/src/mesa/glapi/glapi_nop.c
+++ b/src/mesa/glapi/glapi_nop.c
@@ -93,7 +93,7 @@ NoOpUnused(void)
#else
-static void
+static int
NoOpGeneric(void)
{
#if !defined(_WIN32_WCE)
@@ -101,6 +101,7 @@ NoOpGeneric(void)
fprintf(stderr, "GL User Error: calling GL function without a rendering context\n");
}
#endif
+ return 0;
}
#define TABLE_ENTRY(name) (_glapi_proc) NoOpGeneric