Merge pull request #105887 from Repiteo/core/modernize-headers

Core: Modernize C headers with C++ equivalents

modules/gltf/gltf_document.cpp

@@ -77,8 +77,8 @@
 #define GLTF_IMPORT_DISCARD_MESHES_AND_MATERIALS 32
 #define GLTF_IMPORT_FORCE_DISABLE_MESH_COMPRESSION 64
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 constexpr int COMPONENT_COUNT_FOR_ACCESSOR_TYPE[7] = {
 	1, 2, 3, 4, 4, 9, 16

modules/jolt_physics/jolt_globals.cpp

@@ -42,7 +42,7 @@
 
 #include "Jolt/RegisterTypes.h"
 
-#include <stdarg.h>
+#include <cstdarg>
 
 void *jolt_alloc(size_t p_size) {
 	return Memory::alloc_static(p_size);

modules/jolt_physics/jolt_project_settings.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 enum JoltJointWorldNode : int {
 	JOLT_JOINT_WORLD_NODE_A,

modules/jolt_physics/spaces/jolt_broad_phase_layer.h

@@ -34,7 +34,7 @@
 
 #include "Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace JoltBroadPhaseLayer {
 

modules/jolt_physics/spaces/jolt_temp_allocator.h

@@ -34,7 +34,7 @@
 
 #include "Jolt/Core/TempAllocator.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 class JoltTempAllocator final : public JPH::TempAllocator {
 	uint64_t capacity = 0;

modules/jpg/image_loader_libjpeg_turbo.cpp

@@ -32,8 +32,6 @@
 
 #include <turbojpeg.h>
 
-#include <string.h>
-
 Error jpeg_turbo_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer, int p_buffer_len) {
 	tjhandle tj_instance = tj3Init(TJINIT_DECOMPRESS);
 	if (tj_instance == NULL) {

modules/mono/interop_types.h

@@ -36,9 +36,6 @@
 extern "C" {
 #endif
 
-#include <stdbool.h>
-#include <stdint.h>
-
 // This is taken from the old GDNative, which was removed.
 
 #define GODOT_VARIANT_SIZE (sizeof(real_t) * 4 + sizeof(int64_t))

modules/mono/utils/path_utils.cpp

@@ -35,7 +35,7 @@
 #include "core/io/file_access.h"
 #include "core/os/os.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #ifdef WINDOWS_ENABLED
 #define WIN32_LEAN_AND_MEAN
@@ -43,8 +43,8 @@
 
 #define ENV_PATH_SEP ";"
 #else
-#include <limits.h>
 #include <unistd.h>
+#include <climits>
 
 #define ENV_PATH_SEP ":"
 #endif

modules/mono/utils/string_utils.cpp

@@ -32,8 +32,8 @@
 
 #include "core/io/file_access.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 namespace {
 

modules/mono/utils/string_utils.h

@@ -33,7 +33,7 @@
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
 
-#include <stdarg.h>
+#include <cstdarg>
 
 String sformat(const String &p_text, const String &p1 = String(), const String &p2 = String(),
 		const String &p3 = String(), const String &p4 = String(), const String &p5 = String(), const String &p6 = String());

modules/text_server_adv/thorvg_svg_in_ot.cpp

@@ -60,7 +60,7 @@ using namespace godot;
 #include <freetype/otsvg.h>
 #include <ft2build.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 FT_Error tvg_svg_in_ot_init(FT_Pointer *p_state) {
 	*p_state = memnew(TVG_State);

modules/text_server_fb/thorvg_svg_in_ot.cpp

@@ -60,7 +60,7 @@ using namespace godot;
 #include <freetype/otsvg.h>
 #include <ft2build.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 FT_Error tvg_svg_in_ot_init(FT_Pointer *p_state) {
 	*p_state = memnew(TVG_State);

modules/upnp/upnp_miniupnp.cpp

@@ -37,7 +37,7 @@
 #include <miniupnpc/miniwget.h>
 #include <miniupnpc/upnpcommands.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 void UPNPMiniUPNP::make_default() {
 	UPNP::_create = UPNPMiniUPNP::_create;

modules/webp/webp_common.cpp

@@ -35,8 +35,6 @@
 #include <webp/decode.h>
 #include <webp/encode.h>
 
-#include <string.h>
-
 namespace WebPCommon {
 Vector<uint8_t> _webp_lossy_pack(const Ref<Image> &p_image, float p_quality) {
 	ERR_FAIL_COND_V(p_image.is_null() || p_image->is_empty(), Vector<uint8_t>());

modules/webxr/godot_webxr.h

@@ -34,8 +34,6 @@
 extern "C" {
 #endif
 
-#include <stddef.h>
-
 enum WebXRInputEvent {
 	WEBXR_INPUT_EVENT_SELECTSTART,
 	WEBXR_INPUT_EVENT_SELECTEND,

modules/webxr/webxr_interface_js.cpp

@@ -45,7 +45,7 @@
 #include "servers/xr/xr_hand_tracker.h"
 
 #include <emscripten.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 void _emwebxr_on_session_supported(char *p_session_mode, int p_supported) {
 	XRServer *xr_server = XRServer::get_singleton();