diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-07-23 04:38:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-23 04:38:16 -0700 |
| commit | 2dee47c8277484f0fdc486ec201ed5c25d7b73a3 (patch) | |
| tree | 60611fb27fc92610176216a8f947cf5bd82d9b63 /src/core/core_timing.h | |
| parent | 624cd9cd983e294cea77a337e8aed916f28ababe (diff) | |
| parent | d63a76f4ce47962d7f191f3d4911c12344c4d249 (diff) | |
Merge pull request #1963 from wwylele/rtc
Implement actual system time
Diffstat (limited to 'src/core/core_timing.h')
| -rw-r--r-- | src/core/core_timing.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 64f5b06d9..3d8a7d0c0 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -26,7 +26,7 @@ extern int g_clock_rate_arm11; inline s64 msToCycles(int ms) { - return g_clock_rate_arm11 / 1000 * ms; + return (s64)g_clock_rate_arm11 / 1000 * ms; } inline s64 msToCycles(float ms) { |