diff options
| author | madmaxoft <github@xoft.cz> | 2014-01-28 16:28:55 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-01-28 16:28:55 +0100 |
| commit | 76457d367338b603808b7821036cf9edc6f95afb (patch) | |
| tree | 17b93357b910f084d021c5e7d824ebf44abf1b59 /src | |
| parent | Fixed a slight bug in RSA encryption code. (diff) | |
| download | cuberite-76457d367338b603808b7821036cf9edc6f95afb.tar cuberite-76457d367338b603808b7821036cf9edc6f95afb.tar.gz cuberite-76457d367338b603808b7821036cf9edc6f95afb.tar.bz2 cuberite-76457d367338b603808b7821036cf9edc6f95afb.tar.lz cuberite-76457d367338b603808b7821036cf9edc6f95afb.tar.xz cuberite-76457d367338b603808b7821036cf9edc6f95afb.tar.zst cuberite-76457d367338b603808b7821036cf9edc6f95afb.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/OSSupport/Timer.cpp | 2 | ||||
| -rw-r--r-- | src/Root.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/OSSupport/Timer.cpp b/src/OSSupport/Timer.cpp index ed16f9e3a..fd838dd0d 100644 --- a/src/OSSupport/Timer.cpp +++ b/src/OSSupport/Timer.cpp @@ -28,7 +28,7 @@ long long cTimer::GetNowTime(void) #else struct timeval now; gettimeofday(&now, NULL); - return (long long)(now.tv_sec * 1000 + now.tv_usec / 1000); + return (long long)now.tv_sec * 1000 + (long long)now.tv_usec / 1000; #endif } diff --git a/src/Root.cpp b/src/Root.cpp index fa1fdb37a..883bfe76e 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -200,7 +200,7 @@ void cRoot::Start(void) long long finishmseconds = Time.GetNowTime(); finishmseconds -= mseconds; - LOG("Startup complete, took %i ms!", finishmseconds); + LOG("Startup complete, took %lld ms!", finishmseconds); #ifdef _WIN32 EnableMenuItem(hmenu, SC_CLOSE, MF_ENABLED); // Re-enable close button #endif |