[cogl] cogl/cogl-renderer.c: Avoid Clash with Newer Windows SDKs
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] cogl/cogl-renderer.c: Avoid Clash with Newer Windows SDKs
- Date: Thu, 20 Mar 2014 18:06:09 +0000 (UTC)
commit 548552a87c4ac73b081844b09ee3d33383cd8ce4
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Mar 6 20:13:07 2014 +0800
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>
(cherry picked from commit 001cffd783cfcce9f68bd976891f11760b2f89cc)
cogl/cogl-renderer.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
index 7fee6b8..dddc249 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]