From c58c781f9331a646a1cdc4f4fc15b67c98214a4f Mon Sep 17 00:00:00 2001
From: Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com>
Date: Tue, 6 Oct 2020 01:00:58 +0200
Subject: [PATCH] Update remote and version of submodule rpmalloc (#5696)

This PR updates the remote URL and content of rpmalloc.

Fixes #4752
Fixes #4806 (assumably)
Helps #5694

You must now run
```
git submodule sync --recursive
```
once to reflect this change.
---
 .gitmodules                          | 2 +-
 src/3rdparty/rpmalloc/CMakeLists.txt | 6 ++++++
 src/3rdparty/rpmalloc/rpmalloc       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 8a9871b7a..ebc1502e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/Lukas-W/qt5-x11embed.git
 [submodule "src/3rdparty/rpmalloc/rpmalloc"]
 	path = src/3rdparty/rpmalloc/rpmalloc
-	url = https://github.com/rampantpixels/rpmalloc.git
+	url = https://github.com/mjansson/rpmalloc.git
 [submodule "plugins/zynaddsubfx/zynaddsubfx"]
 	path = plugins/zynaddsubfx/zynaddsubfx
 	url = https://github.com/lmms/zynaddsubfx.git
diff --git a/src/3rdparty/rpmalloc/CMakeLists.txt b/src/3rdparty/rpmalloc/CMakeLists.txt
index 3b3afa6d3..047c32678 100644
--- a/src/3rdparty/rpmalloc/CMakeLists.txt
+++ b/src/3rdparty/rpmalloc/CMakeLists.txt
@@ -21,6 +21,12 @@ if (NOT LMMS_BUILD_WIN32)
 	)
 endif()
 
+if(MINGW)
+	target_compile_definitions(rpmalloc
+		PRIVATE -D_WIN32_WINNT=0x600
+	)
+endif()
+
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
 	# rpmalloc uses GCC builtin "__builtin_umull_overflow" with ENABLE_VALIDATE_ARGS,
 	# which is only available starting with GCC 5
diff --git a/src/3rdparty/rpmalloc/rpmalloc b/src/3rdparty/rpmalloc/rpmalloc
index b5bdc1805..8d790d2b4 160000
--- a/src/3rdparty/rpmalloc/rpmalloc
+++ b/src/3rdparty/rpmalloc/rpmalloc
@@ -1 +1 @@
-Subproject commit b5bdc18051bb74a22f0bde4bcc90b01cf590b496
+Subproject commit 8d790d2b45e1818e531c61bf649c5225556dd07a