dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gaurded strsafe header

Browse source
This commit is contained in:
Hadis Kakanejadi Fard 2017-01-25 14:05:08 -08:00
parent 2bd81f9e54
commit 3bd848d58a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/shared/core_sqlsrv.h
View file

@ -145,11 +145,14 @@ OACR_WARNING_POP
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
#include <cassert> #include <cassert>
#include <strsafe.h>
#include <memory> #include <memory>
// included for SQL Server specific constants // included for SQL Server specific constants
#include "msodbcsql.h" #include "msodbcsql.h"
#ifdef _WIN32
#include <strsafe.h>
#endif // _WIN32
//********************************************************************************************************************************* //*********************************************************************************************************************************
// Constants and Types // Constants and Types
//********************************************************************************************************************************* //*********************************************************************************************************************************

3
source/shared/xplat.h
View file

@ -228,10 +228,11 @@ typedef windowsULongLong_t ULONGLONG;
/* can be defined in php sources */ /* can be defined in php sources */
#ifdef ODBCVER #ifdef ODBCVER
#undef ODBCVER #undef ODBCVER
#endif
// Build the mplat driver as an ODBC 3.8 driver, so that all of the // 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. // source code shared with Windows SNAC (which is ODBC 3.8) compiles.
#define ODBCVER 0x0380 #define ODBCVER 0x0380
#endif
// Define this to indicate that we provide our own definitions for Windows types // Define this to indicate that we provide our own definitions for Windows types