From bc3ac9b32edc131aaafe1f62ea2784c89cb92524 Mon Sep 17 00:00:00 2001
From: Korcan Hussein <korcan.hussein@collabora.com>
Date: Tue, 28 Jan 2025 10:17:02 +0000
Subject: [PATCH] xrt: add explicit imports for standard C libraries

Recent versions of SDL2 have removed cstd lib
includes in interface header which causes compile errors
on some source files that were implicitly using
them.

Signed-off-by: Shiloh Fen <shiloh@shilohfen.com>
Co-authored-by: Torge Matthies <openglfreak@googlemail.com>
Co-authored-by: Korcan Hussein <korcan.hussein@collabora.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2409>
---
 src/xrt/drivers/qwerty/qwerty_sdl.c      | 1 +
 src/xrt/targets/gui/gui_sdl2.c           | 2 +-
 src/xrt/targets/gui/gui_sdl2_main.c      | 1 +
 src/xrt/targets/sdl_test/sdl_device.c    | 1 +
 src/xrt/targets/sdl_test/sdl_program.cpp | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/xrt/drivers/qwerty/qwerty_sdl.c b/src/xrt/drivers/qwerty/qwerty_sdl.c
index 271af7ea2..79055ae8c 100644
--- a/src/xrt/drivers/qwerty/qwerty_sdl.c
+++ b/src/xrt/drivers/qwerty/qwerty_sdl.c
@@ -12,6 +12,7 @@
 #include "xrt/xrt_device.h"
 #include <SDL2/SDL.h>
 #include <assert.h>
+#include <string.h>
 
 // Amount of look_speed units a mouse delta of 1px in screen space will rotate the device
 #define SENSITIVITY 0.1f
diff --git a/src/xrt/targets/gui/gui_sdl2.c b/src/xrt/targets/gui/gui_sdl2.c
index bee2b078a..a4227e678 100644
--- a/src/xrt/targets/gui/gui_sdl2.c
+++ b/src/xrt/targets/gui/gui_sdl2.c
@@ -10,7 +10,7 @@
 #include "ogl/ogl_api.h"
 #include "gui_sdl2.h"
 #include "util/u_git_tag.h"
-
+#include <stdio.h>
 
 /*
  *
diff --git a/src/xrt/targets/gui/gui_sdl2_main.c b/src/xrt/targets/gui/gui_sdl2_main.c
index 2a16e805b..3b1be04bf 100644
--- a/src/xrt/targets/gui/gui_sdl2_main.c
+++ b/src/xrt/targets/gui/gui_sdl2_main.c
@@ -10,6 +10,7 @@
 #include "util/u_var.h"
 #include "gui_sdl2.h"
 #include "util/u_trace_marker.h"
+#include <string.h>
 
 U_TRACE_TARGET_SETUP(U_TRACE_WHICH_SERVICE)
 
diff --git a/src/xrt/targets/sdl_test/sdl_device.c b/src/xrt/targets/sdl_test/sdl_device.c
index 674d838be..b1d94fe4c 100644
--- a/src/xrt/targets/sdl_test/sdl_device.c
+++ b/src/xrt/targets/sdl_test/sdl_device.c
@@ -13,6 +13,7 @@
 #include "util/u_device.h"
 #include "util/u_distortion_mesh.h"
 
+#include <stdio.h>
 
 static xrt_result_t
 sdl_hmd_get_tracked_pose(struct xrt_device *xdev,
diff --git a/src/xrt/targets/sdl_test/sdl_program.cpp b/src/xrt/targets/sdl_test/sdl_program.cpp
index ace9af8e3..6c62c13e5 100644
--- a/src/xrt/targets/sdl_test/sdl_program.cpp
+++ b/src/xrt/targets/sdl_test/sdl_program.cpp
@@ -13,6 +13,7 @@
 
 #include "sdl_internal.hpp"
 
+#include <cstdio>
 
 void
 sdl_create_window(struct sdl_program *sp)
-- 
2.51.2