From 70e44b846ceaf9eebc336b12a07406c3a418a5c3 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 20 Jun 2014 04:57:46 +0200 Subject: Enable compatibility w/ gcc/mingw64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These changes enable gcc/mingw64 compatibility. Besides adding fixes of my own, the following changes were considered: https://github.com/parasti/OculusSDK-MinGW/commit/8fa94f4cc1d7e9d34a1908a4d69df52e5d998a20 https://github.com/parasti/OculusSDK-MinGW/commit/b4681523477b15bea94379eb11b17be9daa7ac17 https://github.com/larspensjo/OculusSDK-MinGW/commit/213118fdc1798a54b4efb930c3427b694abd8b31 Big KUDOS to - Jānis Rūcis aka 'parasti' - Lars Pensjö aka 'larspensjo' --- LibOVR/Src/OVR_SensorImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'LibOVR/Src/OVR_SensorImpl.cpp') diff --git a/LibOVR/Src/OVR_SensorImpl.cpp b/LibOVR/Src/OVR_SensorImpl.cpp index 91ae7e0..c7d3acd 100644 --- a/LibOVR/Src/OVR_SensorImpl.cpp +++ b/LibOVR/Src/OVR_SensorImpl.cpp @@ -870,7 +870,7 @@ bool SensorDeviceImpl::SetMagCalibrationReport(const MagCalibrationReport &data) // time stamp the calibration char time_str[64]; -#ifdef OVR_OS_WIN32 +#if defined(OVR_OS_WIN32) && defined(OVR_CC_MSVC) struct tm caltime; time_t now = time(0); localtime_s(&caltime, &now); @@ -1074,7 +1074,7 @@ bool SensorDeviceImpl::GetMagCalibrationReport(MagCalibrationReport* data) tm ct; memset(&ct, 0, sizeof(tm)); -#ifdef OVR_OS_WIN32 +#if defined(OVR_OS_WIN32) && defined(OVR_CC_MSVC) struct tm nowtime; localtime_s(&nowtime, &now); ct.tm_isdst = nowtime.tm_isdst; -- cgit v1.2.3