From 001cffd783cfcce9f68bd976891f11760b2f89cc Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 6 Mar 2014 20:13:07 +0800 Subject: [PATCH] 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 --- cogl/cogl-renderer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c index 5bb3fa0ab..9672f7ce0 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