diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-21 01:26:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-21 01:26:07 +0300 |
| commit | 98dabed4de60bc86522632379f2499aecbae2b70 (patch) | |
| tree | 48924b90447eb513f330c1e82d9afbab3719525e /src/test/testlauncher.cpp | |
| parent | ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6 (diff) | |
| download | manaverse-98dabed4de60bc86522632379f2499aecbae2b70.tar.gz manaverse-98dabed4de60bc86522632379f2499aecbae2b70.tar.bz2 manaverse-98dabed4de60bc86522632379f2499aecbae2b70.tar.xz manaverse-98dabed4de60bc86522632379f2499aecbae2b70.zip | |
Fix compilation errors and warnings for another gcc 4.7 snapshot.
Diffstat (limited to 'src/test/testlauncher.cpp')
| -rw-r--r-- | src/test/testlauncher.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index 2f6860d43..d3caa8938 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -36,6 +36,8 @@ #include "resources/image.h" #include "resources/wallpaper.h" +#include <unistd.h> + #ifdef WIN32 #include <windows.h> #define sleep(seconds) Sleep((seconds) * 1000) @@ -128,7 +130,7 @@ int TestLauncher::testFps() int cnt = 500; - gettimeofday(&start, NULL); + gettimeofday(&start, nullptr); for (int k = 0; k < cnt; k ++) { for (int x = 0; x < 800; x += 20) @@ -144,7 +146,7 @@ int TestLauncher::testFps() mainGraphics->updateScreen(); } - gettimeofday(&end, NULL); + gettimeofday(&end, nullptr); int tFps = calcFps(&start, &end, cnt); file << mTest << std::endl; file << tFps << std::endl; |