aboutsummaryrefslogtreecommitdiff
path: root/src/mesh_generator_thread.h
diff options
context:
space:
mode:
authoradrido <robots_only_adrido@gmx.com>2017-06-27 11:54:40 +0200
committerLoïc Blot <nerzhul@users.noreply.github.com>2017-06-27 11:54:40 +0200
commitd7343b6c930d22857f858929ea684acbbeefe482 (patch)
treea4611d3bc6546af879e8cf433cf49ce8df41ab55 /src/mesh_generator_thread.h
parent48cd217e3b6f53af32802c1897ddd1914d215078 (diff)
downloadhax-minetest-server-d7343b6c930d22857f858929ea684acbbeefe482.tar.gz
hax-minetest-server-d7343b6c930d22857f858929ea684acbbeefe482.zip
Fix msvc annoyances (#5963)
* MSVC: Fix '/std:c++11' is not a valid compiler option * MSVC/MINGW: Define 'WIN32_LEAN_AND_MEAN' for the whole project In some obscure cases 'Windows.h" got includet before that definition, which leaded to compilation warnings+errors * MSVC: '/arch:SSE' is only available for x86 * MSVC: Fix float conversation * MSVC/MINGW: use winthreads on Windows * MSVC: 'USE_CMAKE_CONFIG' might be already definied by CMake build system * MSVC: Use all available cpu cores for compiling * Add missing include ctime and use std::time_t
Diffstat (limited to 'src/mesh_generator_thread.h')
-rw-r--r--src/mesh_generator_thread.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesh_generator_thread.h b/src/mesh_generator_thread.h
index 77b34a3ce..051a0dc88 100644
--- a/src/mesh_generator_thread.h
+++ b/src/mesh_generator_thread.h
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef MESH_GENERATOR_THREAD_HEADER
#define MESH_GENERATOR_THREAD_HEADER
+#include <ctime>
#include <mutex>
#include "mapblock_mesh.h"
#include "threading/mutex_auto_lock.h"
@@ -30,7 +31,7 @@ struct CachedMapBlockData
v3s16 p = v3s16(-1337, -1337, -1337);
MapNode *data = nullptr; // A copy of the MapBlock's data member
int refcount_from_queue = 0;
- int last_used_timestamp = std::time(0);
+ std::time_t last_used_timestamp = std::time(0);
CachedMapBlockData() {}
~CachedMapBlockData();