Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing stdint.h includes for GCC 13+ #77949

Merged
merged 1 commit into from
Jun 7, 2023
Merged

Add missing stdint.h includes for GCC 13+ #77949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions thirdparty/glslang/glslang/Include/Common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include <cmath>
#endif
#include <cstdio>
#include <cstdint>
#include <cstdlib>
#include <list>
#include <map>
Expand Down
12 changes: 12 additions & 0 deletions thirdparty/openxr/patches/fix-gcc13-stdint.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions thirdparty/openxr/src/common/platform_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include "xr_dependencies.h"
#include <string>
#include <stdint.h>
#include <stdlib.h>

// OpenXR paths and registry key locations
Expand Down
23 changes: 23 additions & 0 deletions thirdparty/vhacd/0006-fix-gcc13.patch
View file
Open in desktop
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
View file
Open in desktop
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