From 591feaed16dcb64802fcc878e7123995fa5d0346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 7 Jun 2023 11:36:55 +0200 Subject: [PATCH] Add missing stdint.h includes for GCC 13+ Fixes #77927. (cherry picked from commit 10676e78e33c9f5dd2e2957ecddcfd6699173ea7) --- thirdparty/vhacd/0006-fix-gcc13.patch | 23 +++++++++++++++++++++++ thirdparty/vhacd/inc/vhacdManifoldMesh.h | 7 ++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/thirdparty/vhacd/0006-fix-gcc13.patch b/thirdparty/vhacd/0006-fix-gcc13.patch index 954ac4556dc8..b8df42b93629 100644 --- a/thirdparty/vhacd/0006-fix-gcc13.patch +++ b/thirdparty/vhacd/0006-fix-gcc13.patch @@ -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 ++// -- 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 diff --git a/thirdparty/vhacd/inc/vhacdManifoldMesh.h b/thirdparty/vhacd/inc/vhacdManifoldMesh.h index a48f53c5c507..5eed4e13aa33 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 +// -- GODOT end -- + namespace VHACD { class TMMTriangle; class TMMEdge; @@ -139,4 +144,4 @@ class TMMesh { friend class ICHull; }; } -#endif // VHACD_MANIFOLD_MESH_H \ No newline at end of file +#endif // VHACD_MANIFOLD_MESH_H