Merge lp:~vanvugt/compiz-plugins-main/fix-915236 into lp:compiz-plugins-main/0.9.5

[Daniel van Vugt]

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

[Daniel van Vugt (vanvugt)]

On hold. I think this is targeting the wrong branch. Look at this proposal instead:
https://code.launchpad.net/~vanvugt/compiz-animation-plugin/fix-915236/+merge/88346

Unmerged revisions

9. By Daniel van Vugt on 2012-01-12

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

=== modified file 'animation/src/animation.cpp'
--- animation/src/animation.cpp	2011-08-23 13:47:23 +0000
+++ animation/src/animation.cpp	2012-01-12 10:13:26 +0000
@@ -86,6 +86,8 @@
 #include <assert.h>
 #include "private.h"
 
+using namespace compiz::core;
+
 class AnimPluginVTable :
     public CompPlugin::VTableForScreenAndWindow<AnimScreen, AnimWindow>
 {
@@ -1235,7 +1237,7 @@
 
 	if (mLastRedrawTimeFresh)
 	{
-	    msSinceLastPaintActual = TIMEVALDIFF (&curTime, &mLastRedrawTime);
+	    msSinceLastPaintActual = timer::timeval_diff (&curTime, &mLastRedrawTime);
 	    // handle clock rollback
 	    if (msSinceLastPaintActual < 0)
 		msSinceLastPaintActual = 0;