diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-03-06 20:13:07 +0800 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2014-03-20 18:05:09 +0000 |
| commit | 548552a87c4ac73b081844b09ee3d33383cd8ce4 (patch) | |
| tree | a752ff9d8abc9d3374276205445d7cea68c4afc0 | |
| parent | ceec0bddb858588c1f04c50dd6cbda9eb044c4cc (diff) | |
| download | cogl-548552a87c4ac73b081844b09ee3d33383cd8ce4.tar.gz | |
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)
| -rw-r--r-- | 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 7fee6b83..dddc249e 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 |