blob: 86c071b3bd4ad625d8688b61c30039e668a798ff (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From f3cad8426cd808be5ded036ed12a497d27d3742e Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <madame-rachelle@users.noreply.github.com>
Date: Tue, 7 May 2024 08:38:27 -0400
Subject: [PATCH] - duplicate effects of gzdoom commit
https://github.com/ZDoom/gzdoom/commit/d9f03863bfd80157c9d67c0c4b05d4d7e98cd90c
---
libraries/ZWidget/src/widgets/lineedit/lineedit.cpp | 2 +-
source/common/filesystem/source/resourcefile.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/libraries/ZWidget/src/widgets/lineedit/lineedit.cpp b/libraries/ZWidget/src/widgets/lineedit/lineedit.cpp
index 34391fd19..5c90e68e1 100644
--- a/libraries/ZWidget/src/widgets/lineedit/lineedit.cpp
+++ b/libraries/ZWidget/src/widgets/lineedit/lineedit.cpp
@@ -1,4 +1,4 @@
-
+#include <algorithm>
#include "widgets/lineedit/lineedit.h"
#include "core/utf8reader.h"
#include "core/colorf.h"
diff --git a/source/common/filesystem/source/resourcefile.cpp b/source/common/filesystem/source/resourcefile.cpp
index 7a6085d2f..81e2b7850 100644
--- a/source/common/filesystem/source/resourcefile.cpp
+++ b/source/common/filesystem/source/resourcefile.cpp
@@ -34,6 +34,7 @@
**
*/
+#include <algorithm>
#include <miniz.h>
#include "resourcefile.h"
#include "md5.hpp"
@@ -45,7 +46,7 @@
#include "wildcards.hpp"
namespace FileSys {
-
+
// this is for restricting shared file readers to the main thread.
thread_local bool mainThread;
void SetMainThread()
--
2.46.0
|