From 3bd848d58aeeed86b6df2e7ddbfb934220becad7 Mon Sep 17 00:00:00 2001 From: Hadis Kakanejadi Fard Date: Wed, 25 Jan 2017 14:05:08 -0800 Subject: [PATCH] gaurded strsafe header --- source/shared/core_sqlsrv.h | 5 ++++- source/shared/xplat.h | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/shared/core_sqlsrv.h b/source/shared/core_sqlsrv.h index a6d0ae37..c367bfd4 100644 --- a/source/shared/core_sqlsrv.h +++ b/source/shared/core_sqlsrv.h @@ -145,11 +145,14 @@ OACR_WARNING_POP #include #include #include -#include #include // included for SQL Server specific constants #include "msodbcsql.h" +#ifdef _WIN32 +#include +#endif // _WIN32 + //********************************************************************************************************************************* // Constants and Types //********************************************************************************************************************************* diff --git a/source/shared/xplat.h b/source/shared/xplat.h index 74de3c20..c4b10651 100644 --- a/source/shared/xplat.h +++ b/source/shared/xplat.h @@ -228,10 +228,11 @@ typedef windowsULongLong_t ULONGLONG; /* can be defined in php sources */ #ifdef ODBCVER #undef ODBCVER +#endif + // Build the mplat driver as an ODBC 3.8 driver, so that all of the // source code shared with Windows SNAC (which is ODBC 3.8) compiles. #define ODBCVER 0x0380 -#endif // Define this to indicate that we provide our own definitions for Windows types