aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/iphone/osys_main.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2013-07-04 08:44:49 -0400
committerPaul Gilbert2013-07-04 08:44:49 -0400
commitfa737fd5af3763a152e92c4b74c114876b3a8573 (patch)
tree3e698f9c095ba692c6e305b35785a8f45f5e061b /backends/platform/iphone/osys_main.cpp
parenta49a7d5ad4f4435ed8cee0934c94155586f2dd99 (diff)
parentbaafae672f3489b0eaf77c22be0c65ba31e6b73d (diff)
downloadscummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.tar.gz
scummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.tar.bz2
scummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.zip
Merge branch 'master' into tsage_r2r
Diffstat (limited to 'backends/platform/iphone/osys_main.cpp')
-rw-r--r--backends/platform/iphone/osys_main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp
index ed2c886213..460d3fd2ac 100644
--- a/backends/platform/iphone/osys_main.cpp
+++ b/backends/platform/iphone/osys_main.cpp
@@ -166,7 +166,7 @@ void OSystem_IPHONE::suspendLoop() {
_timeSuspended += getMillis() - startTime;
}
-uint32 OSystem_IPHONE::getMillis() {
+uint32 OSystem_IPHONE::getMillis(bool skipRecord) {
//printf("getMillis()\n");
struct timeval currentTime;