Merge pull request #77949 from akien-mga/fix-gcc13-stdint

Add missing `stdint.h` includes for GCC 13+
This commit is contained in:
Rémi Verschelde 2023-06-07 12:08:56 +02:00
commit 17bfccc594
No known key found for this signature in database
GPG Key ID: C3336907360768E1
5 changed files with 43 additions and 1 deletions

View File

@ -45,6 +45,7 @@
#include <cmath>
#endif
#include <cstdio>
#include <cstdint>
#include <cstdlib>
#include <list>
#include <map>

View File

@ -0,0 +1,12 @@
diff --git a/thirdparty/openxr/src/common/platform_utils.hpp b/thirdparty/openxr/src/common/platform_utils.hpp
index 85d5cdab10..2d870cfea7 100644
--- a/thirdparty/openxr/src/common/platform_utils.hpp
+++ b/thirdparty/openxr/src/common/platform_utils.hpp
@@ -11,6 +11,7 @@
#include "xr_dependencies.h"
#include <string>
+#include <stdint.h>
#include <stdlib.h>
// OpenXR paths and registry key locations

View File

@ -11,6 +11,7 @@
#include "xr_dependencies.h"
#include <string>
#include <stdint.h>
#include <stdlib.h>
// OpenXR paths and registry key locations

View File

@ -13,3 +13,26 @@ index 132bdcfb3e..925584cf52 100644
namespace VHACD {
//! Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ).
enum ICHullError {
diff --git a/thirdparty/vhacd/inc/vhacdManifoldMesh.h b/thirdparty/vhacd/inc/vhacdManifoldMesh.h
index a48f53c5c5..5eed4e13aa 100644
--- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h
+++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h
@@ -18,6 +18,11 @@ All rights reserved.
#include "vhacdCircularList.h"
#include "vhacdSArray.h"
#include "vhacdVector.h"
+
+// -- GODOT start --
+#include <cstdint>
+// -- GODOT end --
+
namespace VHACD {
class TMMTriangle;
class TMMEdge;
@@ -139,4 +144,4 @@ private:
friend class ICHull;
};
}
-#endif // VHACD_MANIFOLD_MESH_H
\ No newline at end of file
+#endif // VHACD_MANIFOLD_MESH_H

View File

@ -18,6 +18,11 @@ All rights reserved.
#include "vhacdCircularList.h"
#include "vhacdSArray.h"
#include "vhacdVector.h"
// -- GODOT start --
#include <cstdint>
// -- GODOT end --
namespace VHACD {
class TMMTriangle;
class TMMEdge;
@ -139,4 +144,4 @@ private:
friend class ICHull;
};
}
#endif // VHACD_MANIFOLD_MESH_H
#endif // VHACD_MANIFOLD_MESH_H