From 480df4762537cbfb8fc6e8278288f8fe5bb6fe81 Mon Sep 17 00:00:00 2001
From: Hadis Kakanejadi Fard <v-hakaka@microsoft.com>
Date: Fri, 27 Jan 2017 13:42:10 -0800
Subject: [PATCH] renamed header files with the same name as windows headers

---
 source/shared/FormattedPrint.h                 | 2 +-
 source/shared/StringFunctions.h                | 2 +-
 source/shared/{sal.h => sal_def.h}             | 0
 source/shared/version.h                        | 4 +++-
 source/shared/{intsafe.h => xplat_intsafe.h}   | 4 ++--
 source/shared/{winerror.h => xplat_winerror.h} | 2 +-
 source/shared/{winnls.h => xplat_winnls.h}     | 2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)
 rename source/shared/{sal.h => sal_def.h} (100%)
 rename source/shared/{intsafe.h => xplat_intsafe.h} (99%)
 rename source/shared/{winerror.h => xplat_winerror.h} (99%)
 rename source/shared/{winnls.h => xplat_winnls.h} (99%)

diff --git a/source/shared/FormattedPrint.h b/source/shared/FormattedPrint.h
index 675b369e..f143a2a4 100644
--- a/source/shared/FormattedPrint.h
+++ b/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') ); }
diff --git a/source/shared/StringFunctions.h b/source/shared/StringFunctions.h
index ad390904..bb9d5bc0 100644
--- a/source/shared/StringFunctions.h
+++ b/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
diff --git a/source/shared/sal.h b/source/shared/sal_def.h
similarity index 100%
rename from source/shared/sal.h
rename to source/shared/sal_def.h
diff --git a/source/shared/version.h b/source/shared/version.h
index 819b4b46..ee9d0157 100644
--- a/source/shared/version.h
+++ b/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
 
 
diff --git a/source/shared/intsafe.h b/source/shared/xplat_intsafe.h
similarity index 99%
rename from source/shared/intsafe.h
rename to source/shared/xplat_intsafe.h
index 2398803c..e0cdd76b 100644
--- a/source/shared/intsafe.h
+++ b/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>
 
 //
diff --git a/source/shared/winerror.h b/source/shared/xplat_winerror.h
similarity index 99%
rename from source/shared/winerror.h
rename to source/shared/xplat_winerror.h
index 3eac00a3..f7cd1716 100644
--- a/source/shared/winerror.h
+++ b/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
 //
diff --git a/source/shared/winnls.h b/source/shared/xplat_winnls.h
similarity index 99%
rename from source/shared/winnls.h
rename to source/shared/xplat_winnls.h
index b5a538ad..0f21a44a 100644
--- a/source/shared/winnls.h
+++ b/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
 //