[Cogl] [Patch][1.18] Avoid clashes with Windows SDK 8.0+ headers

[Fan Chun-wei]

Hi,

Sorry, I am resending this as I sent this e-mail from the wrong e-mail 
address, which was not subscribed to the mail list.

There was a commit named "generalize driver description and selection" 
(commit id 34658ea0) that made use of DriverCallback as a function 
pointer variable name.  However, this causes issues for builds using the 
later Windows SDK headers (8.0+) as DriverCallback is a function defined 
in one of its headers, in which the build breaks.  This patch renames 
the DriverCallback to DriverCallbackCogl to avoid the issue.

With blessings, thank you!
-------------- next part --------------
From 870aa1ce78f2e66e5a04497603e681d6fe682d8a Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei at src.gnome.org>
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 DriverCallbackCogl to
avoid this problem.
---
 cogl/cogl-renderer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
index b1d8c0b..246ad1d 100644
--- a/cogl/cogl-renderer.c
+++ b/cogl/cogl-renderer.c
@@ -365,12 +365,12 @@ cogl_renderer_check_onscreen_template (CoglRenderer *renderer,
   return TRUE;
 }
 
-typedef CoglBool (*DriverCallback) (CoglDriverDescription *description,
+typedef CoglBool (*DriverCallbackCogl) (CoglDriverDescription *description,
                                     void *user_data);
 
 static void
 foreach_driver_description (CoglDriver driver_override,
-                            DriverCallback callback,
+                            DriverCallbackCogl callback,
                             void *user_data)
 {
 #ifdef COGL_DEFAULT_DRIVER
-- 
1.8.3.msysgit.0