Merge branch 'vanilla_0.4.4' and resolve conflicts

TODO: Validate for removed patches due to relocation

Resolved Conflicts:
	LibOVR/Src/Kernel/OVR_ThreadsWinAPI.cpp
	LibOVR/Src/OVR_Linux_HMDDevice.cpp
	LibOVR/Src/OVR_OSX_HMDDevice.cpp
	LibOVR/Src/OVR_Profile.cpp
	LibOVR/Src/OVR_Sensor2Impl.cpp
	LibOVR/Src/OVR_SensorFusion.cpp
	LibOVR/Src/OVR_SensorImpl.cpp
	LibOVR/Src/OVR_Win32_DeviceStatus.cpp
	LibOVR/Src/OVR_Win32_HIDDevice.cpp
	LibOVR/Src/OVR_Win32_HIDDevice.h
	LibOVR/Src/OVR_Win32_HMDDevice.cpp

1 files changed, 14 insertions, 14 deletions

diff --git a/LibOVR/Src/Kernel/OVR_SysFile.cpp b/LibOVR/Src/Kernel/OVR_SysFile.cpp
index 604527a..6ef27c7 100644
--- a/LibOVR/Src/Kernel/OVR_SysFile.cpp
+++ b/LibOVR/Src/Kernel/OVR_SysFile.cpp
@@ -6,16 +6,16 @@ Content     :   File wrapper class implementation (Win32)
 Created     :   April 5, 1999
 Authors     :   Michael Antonov
 
-Copyright   :   Copyright 2014 Oculus VR, Inc. All Rights reserved.
+Copyright   :   Copyright 2014 Oculus VR, LLC All Rights reserved.
 
-Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); 
+Licensed under the Oculus VR Rift SDK License Version 3.2 (the "License"); 
 you may not use the Oculus VR Rift SDK except in compliance with the License, 
 which is provided at the time of installation or download, or which 
 otherwise accompanies this software in either electronic or hard copy form.
 
 You may obtain a copy of the License at
 
-http://www.oculusvr.com/licenses/LICENSE-3.1 
+http://www.oculusvr.com/licenses/LICENSE-3.2 
 
 Unless required by applicable law or agreed to in writing, the Oculus VR SDK 
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -51,24 +51,24 @@ public:
 
     // Return position / file size
     virtual int         Tell()                      { return 0; }
-    virtual SInt64      LTell()                     { return 0; }
+    virtual int64_t     LTell()                     { return 0; }
     virtual int         GetLength()                 { return 0; }
-    virtual SInt64      LGetLength()                { return 0; }
+    virtual int64_t     LGetLength()                { return 0; }
 
 //  virtual bool        Stat(FileStats *pfs)        { return 0; }
     virtual int         GetErrorCode()              { return Error_FileNotFound; }
 
     // ** Stream implementation & I/O
-    virtual int         Write(const UByte *pbuffer, int numBytes)     { return -1; OVR_UNUSED2(pbuffer, numBytes); }
-    virtual int         Read(UByte *pbuffer, int numBytes)            { return -1; OVR_UNUSED2(pbuffer, numBytes); }
-    virtual int         SkipBytes(int numBytes)                       { return 0;  OVR_UNUSED(numBytes); }
-    virtual int         BytesAvailable()                              { return 0; }
-    virtual bool        Flush()                                       { return 0; }
-    virtual int         Seek(int offset, int origin)                  { return -1; OVR_UNUSED2(offset, origin); }
-    virtual SInt64      LSeek(SInt64 offset, int origin)              { return -1; OVR_UNUSED2(offset, origin); }
+    virtual int         Write(const uint8_t * /*pbuffer*/, int /*numBytes*/) { return -1; }
+    virtual int         Read(uint8_t * /*pbuffer*/, int /*numBytes*/)         { return -1; }
+    virtual int         SkipBytes(int /*numBytes*/)                          { return  0; }
+    virtual int         BytesAvailable()                                     { return  0; }
+    virtual bool        Flush()                                              { return  0; }
+    virtual int         Seek(int /*offset*/, int /*origin*/)                 { return -1; }
+    virtual int64_t     LSeek(int64_t /*offset*/, int /*origin*/)            { return -1; }
     
-    virtual int         CopyFromStream(File *pstream, int byteSize)   { return -1; OVR_UNUSED2(pstream, byteSize); }
-    virtual bool        Close()                                       { return 0; }    
+    virtual int         CopyFromStream(File * /*pstream*/, int /*byteSize*/)  { return -1; }
+    virtual bool        Close()                                              { return  0; }
 };