diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-19 10:58:47 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-19 10:58:47 +0000 |
| commit | 203a94d5e02498df103097156221d1d3e6923878 (patch) | |
| tree | d4a4b114ba96ec3dc63111afd540ac3921429a78 /src/log.cpp | |
| parent | ed2a0416cccf6e0d69674f0f8b9663fe7371af70 (diff) | |
| download | mana-203a94d5e02498df103097156221d1d3e6923878.tar.gz mana-203a94d5e02498df103097156221d1d3e6923878.tar.bz2 mana-203a94d5e02498df103097156221d1d3e6923878.tar.xz mana-203a94d5e02498df103097156221d1d3e6923878.zip | |
Merged revisions 3739,3743-3744,3746-3747 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
........
r3739 | umperio | 2007-11-16 11:49:58 +0100 (Fri, 16 Nov 2007) | 1 line
Removed useless win32 implementation of gettimeofday.
........
r3743 | umperio | 2007-11-16 15:14:00 +0100 (Fri, 16 Nov 2007) | 1 line
Fixed minor issues.
........
r3747 | b_lindeijer | 2007-11-18 23:05:16 +0100 (Sun, 18 Nov 2007) | 2 lines
Fixed small mapping error, collision layer not changed.
........
Diffstat (limited to 'src/log.cpp')
| -rw-r--r-- | src/log.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/log.cpp b/src/log.cpp index 224736bd..e0825ebc 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -21,13 +21,11 @@ #include "log.h" -#ifdef WIN32 -#include "utils/wingettimeofday.h" -#else #include <sys/time.h> -#endif -#ifdef __APPLE__ +#ifdef WIN32 +#include <windows.h> +#elif __APPLE__ #include <Carbon/Carbon.h> #endif |