From 3595f6a8a023ade5d2bf7485a24a0b7678ad86e0 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 11 Aug 2015 14:06:35 -0700 Subject: [PATCH] Fixing bad success macro for the Oculus SDK on windows --- .../src/display-plugins/oculus/OculusBaseDisplayPlugin.h | 4 ---- .../src/display-plugins/oculus/OculusHelpers.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/display-plugins/src/display-plugins/oculus/OculusBaseDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/oculus/OculusBaseDisplayPlugin.h index b338e2709b..e376ae12ba 100644 --- a/libraries/display-plugins/src/display-plugins/oculus/OculusBaseDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/oculus/OculusBaseDisplayPlugin.h @@ -24,7 +24,3 @@ public: virtual glm::mat4 getHeadPose() const override; }; - -#if (OVR_MAJOR_VERSION < 6) -#define OVR_SUCCESS(x) x -#endif diff --git a/libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h b/libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h index d4e1bec312..31b7c246af 100644 --- a/libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h +++ b/libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h @@ -12,6 +12,10 @@ #include #include +#if (OVR_MAJOR_VERSION < 6) +#define OVR_SUCCESS(x) x +#endif + // Convenience method for looping over each eye with a lambda template inline void ovr_for_each_eye(Function function) {