[Bf-blender-cvs] [8c8bc114b8e] xr-controller-support: Fix errors/warnings on Linux, gcc

[Peter Kim]

Commit: 8c8bc114b8e69060a3f0408d0c061807246dc392
Author: Peter Kim
Date:   Sat May 15 22:15:06 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rB8c8bc114b8e69060a3f0408d0c061807246dc392

Fix errors/warnings on Linux, gcc

===================================================================

M	intern/ghost/GHOST_Types.h
M	intern/ghost/intern/GHOST_XrAction.cpp
M	intern/ghost/intern/GHOST_XrAction.h
M	source/blender/windowmanager/xr/intern/wm_xr_session.c

===================================================================

diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
index 67dbd9c67a6..2a13812365d 100644
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@ -634,7 +634,7 @@ typedef enum GHOST_TXrGraphicsBinding {
 
 typedef void (*GHOST_XrErrorHandlerFn)(const struct GHOST_XrError *);
 
-typedef void (*GHOST_XrSessionCreateFn)();
+typedef void (*GHOST_XrSessionCreateFn)(void);
 typedef void (*GHOST_XrSessionExitFn)(void *customdata);
 typedef void (*GHOST_XrCustomdataFreeFn)(void *customdata);
 
diff --git a/intern/ghost/intern/GHOST_XrAction.cpp b/intern/ghost/intern/GHOST_XrAction.cpp
index b355844ced2..3915a2c4553 100644
--- a/intern/ghost/intern/GHOST_XrAction.cpp
+++ b/intern/ghost/intern/GHOST_XrAction.cpp
@@ -19,6 +19,7 @@
  */
 
 #include <cassert>
+#include <cstring>
 
 #include "GHOST_Types.h"
 
diff --git a/intern/ghost/intern/GHOST_XrAction.h b/intern/ghost/intern/GHOST_XrAction.h
index f72736dbd2a..4e1def87f37 100644
--- a/intern/ghost/intern/GHOST_XrAction.h
+++ b/intern/ghost/intern/GHOST_XrAction.h
@@ -111,7 +111,6 @@ class GHOST_XrAction {
   /* Profiles identified by interaction profile path. */
   std::map<std::string, GHOST_XrActionProfile> m_profiles;
 
- private:
   void freeCustomData();
 };
 
@@ -145,7 +144,6 @@ class GHOST_XrActionSet {
 
   std::map<std::string, GHOST_XrAction> m_actions;
 
- private:
   void freeCustomData();
 };
 
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.c b/source/blender/windowmanager/xr/intern/wm_xr_session.c
index 056113a864d..78abc05a338 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c
@@ -77,7 +77,7 @@ static void wm_xr_session_object_pose_set(const GHOST_XrPose *pose, Object *ob)
   DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
 }
 
-static void wm_xr_session_create_cb()
+static void wm_xr_session_create_cb(void)
 {
   Main *bmain = G_MAIN;
   wmWindowManager *wm = bmain->wm.first;