aboutsummaryrefslogtreecommitdiff
path: root/src/utility.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2010-12-21 18:08:24 +0200
committerPerttu Ahola <celeron55@gmail.com>2010-12-21 18:08:24 +0200
commit3f5bad938a3fcb601ad41924a4707476b8b87241 (patch)
treeddf9d7d49a93c092c31fcbdd6bf1c2ad42e43bc8 /src/utility.h
parent3b0bff2f743a3abf100368f94efafa7c2843a9b7 (diff)
downloadminetest-3f5bad938a3fcb601ad41924a4707476b8b87241.tar.gz
minetest-3f5bad938a3fcb601ad41924a4707476b8b87241.tar.bz2
minetest-3f5bad938a3fcb601ad41924a4707476b8b87241.zip
organizing stuff.
Diffstat (limited to 'src/utility.h')
-rw-r--r--src/utility.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/utility.h b/src/utility.h
index bfee15e61..484b5828b 100644
--- a/src/utility.h
+++ b/src/utility.h
@@ -28,18 +28,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <jmutex.h>
#include <jmutexautolock.h>
-#ifdef _WIN32
- #include <windows.h>
- #define sleep_ms(x) Sleep(x)
-#else
- #include <unistd.h>
- #define sleep_ms(x) usleep(x*1000)
-#endif
-
#include "common_irrlicht.h"
#include "debug.h"
#include "strfnd.h"
#include "exceptions.h"
+#include "porting.h"
extern const v3s16 g_26dirs[26];
@@ -404,7 +397,7 @@ class IrrlichtWrapper;
class TimeTaker
{
public:
- TimeTaker(const char *name, IrrlichtWrapper *irrlicht, u32 *result=NULL);
+ TimeTaker(const char *name, u32 *result=NULL);
~TimeTaker()
{
@@ -415,7 +408,6 @@ public:
private:
const char *m_name;
- IrrlichtWrapper *m_irrlicht;
u32 m_time1;
bool m_running;
u32 *m_result;