From 163b39b7a145b83ce7511cb1c8d75d3504bc7179 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik <ryan.pavlik@collabora.com> Date: Mon, 2 Mar 2020 16:32:13 -0600 Subject: [PATCH] st/oxr: Fix some 32-bit porting warnings. --- src/xrt/state_trackers/oxr/oxr_api_negotiate.c | 2 +- src/xrt/state_trackers/oxr/oxr_api_verify.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xrt/state_trackers/oxr/oxr_api_negotiate.c b/src/xrt/state_trackers/oxr/oxr_api_negotiate.c index feef2375d..411e9ad75 100644 --- a/src/xrt/state_trackers/oxr/oxr_api_negotiate.c +++ b/src/xrt/state_trackers/oxr/oxr_api_negotiate.c @@ -290,7 +290,7 @@ oxr_xrGetInstanceProcAddr(XrInstance instance, // We need to set this unconditionally, per the spec. *function = NULL; - if (instance == NULL) { + if ((void *)instance == NULL) { oxr_log_init(&log, "xrGetInstanceProcAddr"); return handle_null(&log, name, function); } diff --git a/src/xrt/state_trackers/oxr/oxr_api_verify.h b/src/xrt/state_trackers/oxr/oxr_api_verify.h index ebfc4d6f4..82e1920dc 100644 --- a/src/xrt/state_trackers/oxr/oxr_api_verify.h +++ b/src/xrt/state_trackers/oxr/oxr_api_verify.h @@ -18,7 +18,7 @@ extern "C" { lookup) \ do { \ oxr_log_init(log, name); \ - if (thing == NULL) { \ + if ((void *)thing == NULL) { \ return oxr_error(log, XR_ERROR_HANDLE_INVALID, \ "(" #thing " == NULL)"); \ } \ @@ -40,7 +40,7 @@ extern "C" { #define _OXR_VERIFY_SET(log, arg, new_arg, THING) \ do { \ - if (arg == NULL) { \ + if ((void *)arg == NULL) { \ return oxr_error(log, XR_ERROR_HANDLE_INVALID, \ "(" #arg " == NULL)"); \ } \