renamed header files with the same name as windows headers

source/shared/FormattedPrint.h

@@ -21,7 +21,7 @@
 #ifndef _FORMATTEDPRINT_H_
 #define _FORMATTEDPRINT_H_
 
-#include "winnls.h"
+#include "xplat_winnls.h"
 #include "localization.hpp"
 
 inline bool __ascii_iswalpha(WCHAR c) { return( ('A' <= (c) && (c) <= 'Z') || ( 'a' <= (c) && (c) <= 'z') ); }

source/shared/StringFunctions.h

@@ -20,7 +20,7 @@
 #if !defined(_STRINGFUNCTIONS_H_)
 #define _STRINGFUNCTIONS_H_
 
-#include "winnls.h"
+#include "xplat_winnls.h"
 
 // ---------------------------------------------------------------------------
 // Declare internal versions of string handling functions

source/shared/version.h

@@ -1,3 +1,5 @@
+#ifndef VERSION_H
+#define VERSION_H
 //---------------------------------------------------------------------------------------------------------------------------------
 // File: version.h
 // Contents: Version number constants
@@ -30,6 +32,6 @@
 #define PHP_SQLSRV_VERSION      STRINGIFY( SQLVERSION_MAJOR ) "." STRINGIFY( SQLVERSION_MINOR ) "." STRINGIFY( SQLVERSION_RELEASE )
 #define PHP_PDO_SQLSRV_VERSION  PHP_SQLSRV_VERSION
 
-
+#endif // VERSION_H
 
 

source/shared/xplat_intsafe.h

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------------------------------------------------
-// File: intsafe.h
+// File: xplat_intsafe.h
 //
 // Contents: This module defines helper functions to prevent
 //			 integer overflow bugs.
@@ -34,7 +34,7 @@
 #endif
 #endif
 
-#include "sal.h"
+#include "sal_def.h"
 #include <limits.h>
 
 //

source/shared/xplat_winerror.h

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------------------------------------------------
-// File: winerror.h
+// File: xplat_winerror.h
 //
 // Contents: Contains the minimal definitions to build on non-Windows platforms
 //

source/shared/xplat_winnls.h

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------------------------------------------------
-// File: winnls.h
+// File: xplat_winnls.h
 //
 // Contents: Contains the minimal definitions to build on non-Windows platforms
 //