Skip to content

Commit 1a2ad2f

Browse files
committed
Merge pull request godotengine#102022 from akien-mga/glslang-fix-gcc15
Add missing `cstdint` includes for GCC 15
2 parents 7d18547 + 1823460 commit 1a2ad2f

File tree

4 files changed

+26
-0
lines changed

4 files changed

+26
-0
lines changed

thirdparty/glslang/SPIRV/SpvBuilder.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ namespace spv {
5656
}
5757

5858
#include <algorithm>
59+
#include <cstdint>
5960
#include <map>
6061
#include <memory>
6162
#include <set>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/thirdparty/glslang/SPIRV/SpvBuilder.h b/thirdparty/glslang/SPIRV/SpvBuilder.h
2+
index a65a98e337..1499592c4f 100644
3+
--- a/thirdparty/glslang/SPIRV/SpvBuilder.h
4+
+++ b/thirdparty/glslang/SPIRV/SpvBuilder.h
5+
@@ -56,6 +56,7 @@ namespace spv {
6+
}
7+
8+
#include <algorithm>
9+
+#include <cstdint>
10+
#include <map>
11+
#include <memory>
12+
#include <set>

thirdparty/thorvg/inc/thorvg.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifndef _THORVG_H_
22
#define _THORVG_H_
33

4+
#include <cstdint>
45
#include <functional>
56
#include <memory>
67
#include <string>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/thirdparty/thorvg/inc/thorvg.h b/thirdparty/thorvg/inc/thorvg.h
2+
index 8e3ab4e6ce..f515a03136 100644
3+
--- a/thirdparty/thorvg/inc/thorvg.h
4+
+++ b/thirdparty/thorvg/inc/thorvg.h
5+
@@ -1,6 +1,7 @@
6+
#ifndef _THORVG_H_
7+
#define _THORVG_H_
8+
9+
+#include <cstdint>
10+
#include <functional>
11+
#include <memory>
12+
#include <string>

0 commit comments

Comments
 (0)