diff options
| author | Alejandro Marzini | 2010-06-08 03:31:27 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-06-08 03:31:27 +0000 |
| commit | 7ea78b10364d34ae607a9a1da00e4d42ad691aa1 (patch) | |
| tree | c16c3d224b2ad1179dbf3e7c54b5c0212b0581a4 /backends/platform/psp/osys_psp.cpp | |
| parent | 7e9d54a69a3444f5335b8cf6ecabdeffe2830644 (diff) | |
| parent | ea2e2053f25c216342c74bb7a74dabc682766720 (diff) | |
| download | scummvm-rg350-7ea78b10364d34ae607a9a1da00e4d42ad691aa1.tar.gz scummvm-rg350-7ea78b10364d34ae607a9a1da00e4d42ad691aa1.tar.bz2 scummvm-rg350-7ea78b10364d34ae607a9a1da00e4d42ad691aa1.zip | |
Merged from trunk.
svn-id: r49499
Diffstat (limited to 'backends/platform/psp/osys_psp.cpp')
| -rw-r--r-- | backends/platform/psp/osys_psp.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index a36ae1847f..2043a4bef2 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -37,7 +37,6 @@ #include "backends/platform/psp/psppixelformat.h" #include "backends/platform/psp/osys_psp.h" #include "backends/platform/psp/powerman.h" -#include "backends/platform/psp/thread.h" #include "backends/saves/psp/psp-saves.h" #include "backends/timer/default/default-timer.h" @@ -300,7 +299,7 @@ bool OSystem_PSP::pollEvent(Common::Event &event) { } uint32 OSystem_PSP::getMillis() { - return PspThread::getMillis(); + return _pspRtc.getMillis(); } void OSystem_PSP::delayMillis(uint msecs) { |