Browse Source

Add missing stdint.h includes for GCC 13+

Fixes #77927.

(cherry picked from commit 10676e78e33c9f5dd2e2957ecddcfd6699173ea7)
Rémi Verschelde 2 years ago
parent
commit
f9c0cd6a36
2 changed files with 29 additions and 1 deletions
  1. 23 0
      thirdparty/vhacd/0006-fix-gcc13.patch
  2. 6 1
      thirdparty/vhacd/inc/vhacdManifoldMesh.h

+ 23 - 0
thirdparty/vhacd/0006-fix-gcc13.patch

@@ -13,3 +13,26 @@ index 132bdcfb3e..925584cf52 100644
  namespace VHACD {
  namespace VHACD {
  //!    Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ).
  //!    Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ).
  enum ICHullError {
  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

+ 6 - 1
thirdparty/vhacd/inc/vhacdManifoldMesh.h

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