From 704f00560463d9f561fe39fbab6ce6701f47d9ed Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Mon, 7 Jan 2019 17:09:43 -0800
Subject: [PATCH] changing user id variable type

---
 plugins/oculus/src/OculusBaseDisplayPlugin.cpp | 3 ---
 plugins/oculus/src/OculusBaseDisplayPlugin.h   | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
index 651fa282c5..067f6dbb32 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
@@ -14,9 +14,6 @@
 #include <gl/Config.h>
 #include <shared/GlobalAppProperties.h>
 
-#define OVRPL_DISABLED
-#include <OVR_Platform.h>
-
 #include "OculusHelpers.h"
 
 using namespace hifi;
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.h b/plugins/oculus/src/OculusBaseDisplayPlugin.h
index 916fad891e..8802b1cff1 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.h
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.h
@@ -13,6 +13,9 @@
 
 #include <OVR_CAPI_GL.h>
 
+#define OVRPL_DISABLED
+#include <OVR_Platform.h>
+
 class OculusBaseDisplayPlugin : public HmdDisplayPlugin {
     using Parent = HmdDisplayPlugin;
 public:
@@ -48,7 +51,7 @@ protected:
     bool _isViewerEntitled;
     QString _nonce;
     QString _user;
-    uint64_t _userID;
+    ovrID _userID;
     ovrSession _session{ nullptr };
     ovrGraphicsLuid _luid;
     std::array<ovrEyeRenderDesc, 2> _eyeRenderDescs;