diff options
| author | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
| commit | bca8ce861ad3439881fef0f916b592aafc4ee010 (patch) | |
| tree | caaa3d79b0b47624ef48a48248b63f765a5e0628 /backends/timer/default/default-timer.h | |
| parent | c1b5626bca1e0e08316353f1ead00ed763cd5380 (diff) | |
| parent | c839fd50b5ddfcceada8cbbd3046ce219df248a0 (diff) | |
| download | scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.gz scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.bz2 scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.zip | |
Merge remote-tracking branch 'origin/master' into wintermute
Diffstat (limited to 'backends/timer/default/default-timer.h')
| -rw-r--r-- | backends/timer/default/default-timer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/backends/timer/default/default-timer.h b/backends/timer/default/default-timer.h index e5a9dada79..5884979da0 100644 --- a/backends/timer/default/default-timer.h +++ b/backends/timer/default/default-timer.h @@ -34,7 +34,6 @@ private: typedef Common::HashMap<Common::String, TimerProc, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> TimerSlotMap; Common::Mutex _mutex; - void *_timerHandler; TimerSlot *_head; TimerSlotMap _callbacks; |