Skip to content

Commit

Permalink
Add missing stdint.h includes for GCC 13+
Browse files Browse the repository at this point in the history
Fixes godotengine#77927.

(cherry picked from commit 10676e7)
  • Loading branch information
akien-mga committed Aug 28, 2023
1 parent 2051e38 commit 591feae
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
23 changes: 23 additions & 0 deletions thirdparty/vhacd/0006-fix-gcc13.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 6 additions & 1 deletion thirdparty/vhacd/inc/vhacdManifoldMesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -139,4 +144,4 @@ class TMMesh {
friend class ICHull;
};
}
#endif // VHACD_MANIFOLD_MESH_H
#endif // VHACD_MANIFOLD_MESH_H

0 comments on commit 591feae

Please sign in to comment.