← Back to branch summary

~ubuntu-branches/debian/sid/mame/sid

« back to all changes in this revision

Viewing changes to src/emu/schedule.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach, Emmanuel Kasper, Jordi Mallach
  • Date: 2012-06-05 20:02:23 UTC
  • mfrom: (0.3.1) (0.1.4)
  • Revision ID: package-import@ubuntu.com-20120605200223-gnlpogjrg6oqe9md
Tags: 0.146-1
[ Emmanuel Kasper ]
* New upstream release
* Drop patch to fix man pages section and patches to link with flac 
  and jpeg system lib: all this has been pushed upstream by Cesare Falco
* Add DM-Upload-Allowed: yes field.

[ Jordi Mallach ]
* Create a "gnu" TARGETOS stanza that defines NO_AFFINITY_NP.
* Stop setting TARGETOS to "unix" in d/rules. It should be autodetected,
  and set to the appropriate value.
* mame_manpage_section.patch: Change mame's manpage section to 6 (games),
  in the TH declaration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/emu/schedule.c
38
38
***************************************************************************/
39
39
 
40
40
#include "emu.h"
41
 
#include "profiler.h"
42
41
#include "debugger.h"
43
42
 
44
43
 
252
251
 
253
252
attotime emu_timer::remaining() const
254
253
{
255
 
        return m_expire - machine().time();
 
254
        attotime curtime = machine().time();
 
255
        if (curtime >= m_expire)
 
256
                return attotime::zero;
 
257
        return m_expire - curtime;
256
258
}
257
259
 
258
260