summaryrefslogtreecommitdiff
path: root/cogl
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2014-03-06 20:13:07 +0800
committerNeil Roberts <neil@linux.intel.com>2014-03-20 17:56:52 +0000
commit001cffd783cfcce9f68bd976891f11760b2f89cc (patch)
tree5f32a576a97604510478d1c95650ac11b6da1195 /cogl
parented06915e61ac20ed3297aca83c210a12f9575d6f (diff)
cogl/cogl-renderer.c: Avoid Clash with Newer Windows SDKs
The DriverCallback is a function that is defined by the Windows SDK 8.0+ headers, which was initially used for device driver development. The use of DriverCallback would cause a clash, causing things to break when built with newer Windows SDKs, so rename DriverCallback to CoglDriverCallback to avoid this problem. Reviewed-by: Neil Roberts <neil@linux.intel.com>
Diffstat (limited to 'cogl')
-rw-r--r--cogl/cogl-renderer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
index 5bb3fa0a..9672f7ce 100644
--- a/cogl/cogl-renderer.c
+++ b/cogl/cogl-renderer.c
@@ -369,12 +369,12 @@ cogl_renderer_check_onscreen_template (CoglRenderer *renderer,
return TRUE;
}
-typedef CoglBool (*DriverCallback) (CoglDriverDescription *description,
- void *user_data);
+typedef CoglBool (*CoglDriverCallback) (CoglDriverDescription *description,
+ void *user_data);
static void
foreach_driver_description (CoglDriver driver_override,
- DriverCallback callback,
+ CoglDriverCallback callback,
void *user_data)
{
#ifdef COGL_DEFAULT_DRIVER