From ed62451ad3cccb1517de3eb3fd2083f0367cc998 Mon Sep 17 00:00:00 2001
From: lhofhansl <larsh@apache.org>
Date: Wed, 31 Dec 2025 12:18:13 +0100
Subject: [PATCH] Use std::mutex for the env lock (instead of ordered_mutex)
 (#16739)

This is helpful with multiple emerge threads.
---
 src/server.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server.h b/src/server.h
index ed1f1f3458..fe21934f91 100644
--- a/src/server.h
+++ b/src/server.h
@@ -474,7 +474,7 @@ public:
 		EnvAutoLock(Server *server): m_lock(server->m_env_mutex) {}
 
 	private:
-		std::lock_guard<ordered_mutex> m_lock;
+		std::lock_guard<std::mutex> m_lock;
 	};
 
 protected:
@@ -662,7 +662,7 @@ private:
 	*/
 
 	// Environment mutex (envlock)
-	ordered_mutex m_env_mutex;
+	std::mutex m_env_mutex;
 
 	// World directory
 	std::string m_path_world;