From 59c755b5e577122939bb42e1b85036c040d76aa7 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Wed, 2 Apr 2014 15:09:07 -0500 Subject: [PATCH] Minimal requisite alterations for development head as of 02APR2014 for compilation purposes on VS2013. --- Engine/lib/collada/include/dae/daeTypes.h | 1 + Engine/source/core/strings/stringFunctions.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Engine/lib/collada/include/dae/daeTypes.h b/Engine/lib/collada/include/dae/daeTypes.h index 27e560cdd..41e116a4a 100644 --- a/Engine/lib/collada/include/dae/daeTypes.h +++ b/Engine/lib/collada/include/dae/daeTypes.h @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/Engine/source/core/strings/stringFunctions.h b/Engine/source/core/strings/stringFunctions.h index 4dd5a56c9..88bd60398 100644 --- a/Engine/source/core/strings/stringFunctions.h +++ b/Engine/source/core/strings/stringFunctions.h @@ -35,6 +35,8 @@ // These standard functions are not defined on Win32 and other Microsoft platforms... #define strcasecmp _stricmp #define strncasecmp _strnicmp +#endif +#if (_MSC_VER < 1800) && (defined(TORQUE_OS_WIN) || defined(TORQUE_OS_XBOX) || defined(TORQUE_OS_XENON)) #define strtof (float)strtod #endif