Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: third_party/mesa/MesaLib/src/mapi/glapi/glapi_nop.c

Issue 7523033: Eliminate a warning in a failure case. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/mesa/MesaLib/src/mapi/glapi/glapi_nop.c
===================================================================
--- third_party/mesa/MesaLib/src/mapi/glapi/glapi_nop.c (revision 94205)
+++ third_party/mesa/MesaLib/src/mapi/glapi/glapi_nop.c (working copy)
@@ -86,7 +86,7 @@
#define KEYWORD2 GLAPIENTRY
#define NAME(func) NoOp##func
#define DISPATCH(func, args, msg) Warn(#func);
-#define RETURN_DISPATCH(func, args, msg) Warn(#func); return 0
+#define RETURN_DISPATCH(type, func, args, msg) Warn(#func); return (type)0
/*
@@ -96,7 +96,7 @@
#else
-static int
+void
NoOpGeneric(void)
{
#if !defined(_WIN32_WCE)
@@ -104,7 +104,6 @@
fprintf(stderr, "GL User Error: calling GL function without a rendering context\n");
}
#endif
- return 0;
}
/**
@@ -113,7 +112,8 @@
static GLint
NoOpUnused(void)
{
- return NoOpGeneric();
+ NoOpGeneric();
+ return 0;
}
/*
@@ -127,7 +127,7 @@
#define KEYWORD2 GLAPIENTRY
#define NAME(func) NoOp##func
#define DISPATCH(func, args, msg) NoOpGeneric();
-#define RETURN_DISPATCH(func, args, msg) return NoOpGeneric();
+#define RETURN_DISPATCH(type, func, args, msg) NoOpGeneric(); return (type)0
/*
* Defines for the table of no-op entry points.
« no previous file with comments | « third_party/mesa/MesaLib/src/mapi/glapi/glapi_dispatch.c ('k') | third_party/mesa/MesaLib/src/mapi/glapi/glapitemp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698