Compiz Animations Plugin

Merge lp:~vanvugt/compiz-animation-plugin/fix-915236 into lp:compiz-animation-plugin

  1. fix-915236
  2. Merge into 0.9.5
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 394
Merged at revision: 394
Proposed branch: lp:~vanvugt/compiz-animation-plugin/fix-915236
Merge into: lp:compiz-animation-plugin
Diff against target: 21 lines (+3/-1)
1 file modified
src/animation.cpp (+3/-1)
To merge this branch: bzr merge lp:~vanvugt/compiz-animation-plugin/fix-915236
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+88346@code.launchpad.net

Description of the change

Fix failure to build with latest lp:compiz-core due to renamed/moved TIMEVALDIFF macro (now a function) (LP: #915236)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/animation.cpp'
2--- src/animation.cpp 2011-10-03 13:01:33 +0000
3+++ src/animation.cpp 2012-01-12 11:14:25 +0000
4@@ -86,6 +86,8 @@
5 #include <assert.h>
6 #include "private.h"
7
8+using namespace compiz::core;
9+
10 class AnimPluginVTable :
11 public CompPlugin::VTableForScreenAndWindow<AnimScreen, AnimWindow>
12 {
13@@ -1247,7 +1249,7 @@
14
15 if (mLastRedrawTimeFresh)
16 {
17- msSinceLastPaintActual = TIMEVALDIFF (&curTime, &mLastRedrawTime);
18+ msSinceLastPaintActual = timer::timeval_diff (&curTime, &mLastRedrawTime);
19 // handle clock rollback
20 if (msSinceLastPaintActual < 0)
21 msSinceLastPaintActual = 0;

Subscribers

People subscribed via source and target branches