Skip to content

Commit 21b548c

Browse files
authored
Auto merge of #54 - paricbat:fix-build-on-newer-cc, r=jdm
Add and apply a patch that fixes compiler errors on GCC 13 This should fix servo/servo#29674.
2 parents e3558a7 + 6799aa6 commit 21b548c

File tree

3 files changed

+27
-0
lines changed

3 files changed

+27
-0
lines changed

gfx/angle/checkout/include/GLSLANG/ShaderVars.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include <algorithm>
1414
#include <array>
15+
#include <cstdint>
1516
#include <string>
1617
#include <vector>
1718

gfx/angle/checkout/src/common/platform.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,6 @@
108108
# endif // defined(__GNUC__) || defined(__clang__)
109109
#endif // !defined(ANGLE_LIKELY) || !defined(ANGLE_UNLIKELY)
110110

111+
#include <cstdint>
112+
111113
#endif // COMMON_PLATFORM_H_
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/gfx/angle/checkout/include/GLSLANG/ShaderVars.h b/gfx/angle/checkout/include/GLSLANG/ShaderVars.h
2+
index 2bb267e..7cca69e 100644
3+
--- a/gfx/angle/checkout/include/GLSLANG/ShaderVars.h
4+
+++ b/gfx/angle/checkout/include/GLSLANG/ShaderVars.h
5+
@@ -12,6 +12,7 @@
6+
7+
#include <algorithm>
8+
#include <array>
9+
+#include <cstdint>
10+
#include <string>
11+
#include <vector>
12+
13+
diff --git a/gfx/angle/checkout/src/common/platform.h b/gfx/angle/checkout/src/common/platform.h
14+
index acb2157..81d1995 100644
15+
--- a/gfx/angle/checkout/src/common/platform.h
16+
+++ b/gfx/angle/checkout/src/common/platform.h
17+
@@ -108,4 +108,6 @@
18+
# endif // defined(__GNUC__) || defined(__clang__)
19+
#endif // !defined(ANGLE_LIKELY) || !defined(ANGLE_UNLIKELY)
20+
21+
+#include <cstdint>
22+
+
23+
#endif // COMMON_PLATFORM_H_
24+
--

0 commit comments

Comments
 (0)