diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6a3efc252..3bfafe8d1 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -35,6 +35,7 @@ env:
jobs:
# Older gcc version (should be close to our minimum supported version)
gcc_7:
+ if: ${{ false }}
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
@@ -86,6 +87,7 @@ jobs:
# Older clang version (should be close to our minimum supported version)
clang_7:
+ if: ${{ false }}
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
diff --git a/src/client/client.cpp b/src/client/client.cpp
index ff4e48926..1e39fa168 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -19,6 +19,7 @@ You should have received a copy of the GNU General Public License
along with Freeminer. If not, see .
*/
+#include
#include
#include
#include
@@ -450,7 +451,7 @@ void Client::connect(const Address &address, const std::string &address_name,
void Client::step(float dtime)
{
- m_uptime.fetch_add(dtime, std::memory_order::relaxed);
+ m_uptime = m_uptime + dtime;
// Limit a bit
if (dtime > DTIME_LIMIT)
diff --git a/src/porting_android.h b/src/porting_android.h
index 03deb9666..5833cd326 100644
--- a/src/porting_android.h
+++ b/src/porting_android.h
@@ -11,6 +11,9 @@
#include "irrlichttypes_bloated.h"
#include
+class JNIEnv;
+class android_app;
+
namespace porting {
/**
* Show a text input dialog in Java
diff --git a/src/threading/lock.h b/src/threading/lock.h
index e92b43a47..18634b988 100644
--- a/src/threading/lock.h
+++ b/src/threading/lock.h
@@ -24,15 +24,16 @@ along with Freeminer. If not, see .
#include "../config.h"
-#ifdef _WIN32
-#include "../threading/mutex.h"
+using use_mutex = std::mutex;
+
+/*
+#ifdef _WIN32
using use_mutex = std::mutex;
using try_shared_mutex = use_mutex;
using maybe_shared_lock = std::unique_lock;
using unique_lock = std::unique_lock;
const auto try_to_lock = std::try_to_lock;
-
#else
typedef std::mutex use_mutex;
@@ -50,6 +51,8 @@ const auto try_to_lock = boost::try_to_lock;
#elif HAVE_SHARED_MUTEX
//#elif __cplusplus >= 201305L
+*/
+
#include
using try_shared_mutex = std::shared_mutex;
@@ -58,6 +61,7 @@ using unique_lock = std::unique_lock;
const auto try_to_lock = std::try_to_lock;
#define LOCK_TWO 1
+/*
#else
using try_shared_mutex = use_mutex;
@@ -67,6 +71,7 @@ const auto try_to_lock = std::try_to_lock;
#endif
#endif
+*/
// http://stackoverflow.com/questions/4792449/c0x-has-no-semaphores-how-to-synchronize-threads
/* uncomment when need