[Bf-blender-cvs] [ae8fa7062cb] master: Fix incompatible type passed to XR haptic

[Sergey Sharybin]

Commit: ae8fa7062cb4ac9e48acb4c7633142e17c4c9c29
Author: Sergey Sharybin
Date:   Tue Jul 6 12:36:42 2021 +0200
Branches: master
https://developer.blender.org/rBae8fa7062cb4ac9e48acb4c7633142e17c4c9c29

Fix incompatible type passed to XR haptic

Likely caused by recent fixed-size types changes.
Seems to be no-functional-changes since the function is unused.

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

M	source/blender/windowmanager/WM_api.h
M	source/blender/windowmanager/xr/intern/wm_xr_actions.c

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

diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 39ccc5a53e5..1f4598d33fe 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -31,6 +31,7 @@
 
 /* dna-savable wmStructs here */
 #include "BLI_compiler_attrs.h"
+#include "BLI_sys_types.h"
 #include "DNA_windowmanager_types.h"
 #include "WM_keymap.h"
 
@@ -1015,7 +1016,7 @@ bool WM_xr_action_state_get(const wmXrData *xr,
 bool WM_xr_haptic_action_apply(wmXrData *xr,
                                const char *action_set_name,
                                const char *action_name,
-                               const long long *duration,
+                               const int64_t *duration,
                                const float *frequency,
                                const float *amplitude);
 void WM_xr_haptic_action_stop(wmXrData *xr, const char *action_set_name, const char *action_name);
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_actions.c b/source/blender/windowmanager/xr/intern/wm_xr_actions.c
index 51ed3dcfd3c..7eabd29baa0 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_actions.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_actions.c
@@ -462,7 +462,7 @@ bool WM_xr_action_state_get(const wmXrData *xr,
 bool WM_xr_haptic_action_apply(wmXrData *xr,
                                const char *action_set_name,
                                const char *action_name,
-                               const long long *duration,
+                               const int64_t *duration,
                                const float *frequency,
                                const float *amplitude)
 {