summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorUnity <unity@VB-U1010.(none)>2010-12-02 01:04:37 +0800
committerUnity <unity@VB-U1010.(none)>2010-12-02 01:04:37 +0800
commit3f462d97acf5a095dbc034ca6e4468fcdfb48482 (patch)
tree763748bb1bab87959217d3c5b60d384913ff220c /include
parentef1399c6bdd2324000c2f19f55f48a89d1737a51 (diff)
parent81c768f8f3cbd8f2579f161bcc64fd8bc33c57ed (diff)
downloadmobileperf-3f462d97acf5a095dbc034ca6e4468fcdfb48482.tar.gz
mobileperf-3f462d97acf5a095dbc034ca6e4468fcdfb48482.tar.bz2
Merge branch 'glibmm-experimental' of git://git.compiz.org/users/dbo/compiz-with-glib-mainloop into glibmm-experimental
Diffstat (limited to 'include')
-rw-r--r--include/core/timer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/core/timer.h b/include/core/timer.h
index cfdf5ae..3119178 100644
--- a/include/core/timer.h
+++ b/include/core/timer.h
@@ -117,7 +117,7 @@ class CompTimer {
bool mExecuting;
struct timeval tickStart;
- bool internalCallback ();
+ bool internalCallback (unsigned int);
Glib::RefPtr <Glib::TimeoutSource> mSource;
};