diff --git a/xmpsdk/src/ExpatAdapter.cpp b/xmpsdk/src/ExpatAdapter.cpp
index 0cbb0ff3..03798855 100644
--- a/xmpsdk/src/ExpatAdapter.cpp
+++ b/xmpsdk/src/ExpatAdapter.cpp
@@ -19,7 +19,7 @@
 using namespace std;
 
 #if XMP_WinBuild
-#   ifdef _MSV_VER
+#   ifdef _MSC_VER
         #pragma warning ( disable : 4996 )	// '...' was declared deprecated
 #   endif
 #endif
diff --git a/xmpsdk/src/ParseRDF.cpp b/xmpsdk/src/ParseRDF.cpp
index b220a52a..ca23eb3d 100644
--- a/xmpsdk/src/ParseRDF.cpp
+++ b/xmpsdk/src/ParseRDF.cpp
@@ -19,7 +19,7 @@
 using namespace std;
 
 #if XMP_WinBuild
-#   ifdef _MSV_VER
+#   ifdef _MSC_VER
         #pragma warning ( disable : 4189 )	// local variable is initialized but not referenced
         #pragma warning ( disable : 4505 )	// unreferenced local function has been removed
 #   endif
diff --git a/xmpsdk/src/WXMPIterator.cpp b/xmpsdk/src/WXMPIterator.cpp
index a42cc032..4c47b0d3 100644
--- a/xmpsdk/src/WXMPIterator.cpp
+++ b/xmpsdk/src/WXMPIterator.cpp
@@ -13,7 +13,7 @@
 #include "client-glue/WXMPIterator.hpp"
 
 #if XMP_WinBuild
-#   ifdef _MSV_VER
+#   ifdef _MSC_VER
         #pragma warning ( disable : 4101 ) // unreferenced local variable
         #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
         #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
diff --git a/xmpsdk/src/WXMPMeta.cpp b/xmpsdk/src/WXMPMeta.cpp
index 3507b0d7..da2da9dd 100644
--- a/xmpsdk/src/WXMPMeta.cpp
+++ b/xmpsdk/src/WXMPMeta.cpp
@@ -13,7 +13,7 @@
 #include "client-glue/WXMPMeta.hpp"
 
 #if XMP_WinBuild
-    #ifdef _MSV_VER
+    #ifdef _MSC_VER
         #pragma warning ( disable : 4101 ) // unreferenced local variable
         #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
         #pragma warning ( disable : 4702 ) // unreachable code
diff --git a/xmpsdk/src/WXMPUtils.cpp b/xmpsdk/src/WXMPUtils.cpp
index ec5372d4..e3ce4375 100644
--- a/xmpsdk/src/WXMPUtils.cpp
+++ b/xmpsdk/src/WXMPUtils.cpp
@@ -15,7 +15,7 @@
 #include "client-glue/WXMPUtils.hpp"
 
 #if XMP_WinBuild
-    #ifdef _MSV_VER
+    #ifdef _MSC_VER
         #pragma warning ( disable : 4101 ) // unreferenced local variable
         #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
         #pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
diff --git a/xmpsdk/src/XML_Node.cpp b/xmpsdk/src/XML_Node.cpp
index 08209884..5f20358e 100644
--- a/xmpsdk/src/XML_Node.cpp
+++ b/xmpsdk/src/XML_Node.cpp
@@ -17,7 +17,7 @@
 #define XMP_LitNMatch(s,l,n)	(std::strncmp((s),(l),(n)) == 0)
 
 #if XMP_WinBuild
-#ifdef _MSV_VER
+#ifdef _MSC_VER
 	#define snprintf _snprintf
 	#pragma warning ( disable : 4996 )	// snprintf is safe
 #endif
diff --git a/xmpsdk/src/XMPCore_Impl.cpp b/xmpsdk/src/XMPCore_Impl.cpp
index 89e65540..60a7194b 100644
--- a/xmpsdk/src/XMPCore_Impl.cpp
+++ b/xmpsdk/src/XMPCore_Impl.cpp
@@ -18,7 +18,7 @@
 using namespace std;
 
 #if XMP_WinBuild
-    #ifdef _MSV_VER
+    #ifdef _MSC_VER
         #pragma warning ( disable : 4290 )	// C++ exception specification ignored except ... not __declspec(nothrow)
         #pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
     #endif
diff --git a/xmpsdk/src/XMPIterator.cpp b/xmpsdk/src/XMPIterator.cpp
index 1815d37f..e2c74cce 100644
--- a/xmpsdk/src/XMPIterator.cpp
+++ b/xmpsdk/src/XMPIterator.cpp
@@ -15,7 +15,7 @@
 #include <stdio.h>	// For snprintf.
 
 #if XMP_WinBuild
-    #ifdef _MSV_VER
+    #ifdef _MSC_VER
         #pragma warning ( disable : 4702 )	// unreachable code
         #pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
         #pragma warning ( disable : 4996 )	// '...' was declared deprecated
diff --git a/xmpsdk/src/XMPMeta-GetSet.cpp b/xmpsdk/src/XMPMeta-GetSet.cpp
index f4a4d055..992539b8 100644
--- a/xmpsdk/src/XMPMeta-GetSet.cpp
+++ b/xmpsdk/src/XMPMeta-GetSet.cpp
@@ -28,7 +28,7 @@
 using namespace std;
 
 #if XMP_WinBuild
-    #ifdef _MSV_VER
+    #ifdef _MSC_VER
         #pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
         #pragma warning ( disable : 4702 )	// unreachable code
         #pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
diff --git a/xmpsdk/src/XMPMeta-Parse.cpp b/xmpsdk/src/XMPMeta-Parse.cpp
index 5429eac8..c1f6eb1f 100644
--- a/xmpsdk/src/XMPMeta-Parse.cpp
+++ b/xmpsdk/src/XMPMeta-Parse.cpp
@@ -26,7 +26,7 @@
 using namespace std;
 
 #if XMP_WinBuild
-#ifdef _MSV_VER
+#ifdef _MSC_VER
 	#pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
 	#pragma warning ( disable : 4702 )	// unreachable code
 	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
diff --git a/xmpsdk/src/XMPMeta-Serialize.cpp b/xmpsdk/src/XMPMeta-Serialize.cpp
index e2da167e..215cdb36 100644
--- a/xmpsdk/src/XMPMeta-Serialize.cpp
+++ b/xmpsdk/src/XMPMeta-Serialize.cpp
@@ -25,7 +25,7 @@
 using namespace std;
 
 #if XMP_WinBuild
-#ifdef _MSV_VER
+#ifdef _MSC_VER
 	#pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
 	#pragma warning ( disable : 4702 )	// unreachable code
 	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
diff --git a/xmpsdk/src/XMPMeta.cpp b/xmpsdk/src/XMPMeta.cpp
index 965d7633..e6e41b06 100644
--- a/xmpsdk/src/XMPMeta.cpp
+++ b/xmpsdk/src/XMPMeta.cpp
@@ -30,7 +30,7 @@
 using namespace std;
 
 #if XMP_WinBuild
-#ifdef _MSV_VER
+#ifdef _MSC_VER
 	#pragma warning ( disable : 4533 )	// initialization of '...' is skipped by 'goto ...'
 	#pragma warning ( disable : 4702 )	// unreachable code
 	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
diff --git a/xmpsdk/src/XMPUtils-FileInfo.cpp b/xmpsdk/src/XMPUtils-FileInfo.cpp
index 80c60a56..159b542e 100644
--- a/xmpsdk/src/XMPUtils-FileInfo.cpp
+++ b/xmpsdk/src/XMPUtils-FileInfo.cpp
@@ -20,7 +20,7 @@
 #include <stdio.h>	// For snprintf.
 
 #if XMP_WinBuild
-#ifdef _MSV_VER
+#ifdef _MSC_VER
 	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
 #endif
 #endif
diff --git a/xmpsdk/src/XMPUtils.cpp b/xmpsdk/src/XMPUtils.cpp
index e5a8b250..2458b3b9 100644
--- a/xmpsdk/src/XMPUtils.cpp
+++ b/xmpsdk/src/XMPUtils.cpp
@@ -24,7 +24,7 @@
 #include <stdio.h>	// For snprintf.
 
 #if XMP_WinBuild
-#ifdef _MSV_VER
+#ifdef _MSC_VER
 	#pragma warning ( disable : 4800 )	// forcing value to bool 'true' or 'false' (performance warning)
 	#pragma warning ( disable : 4996 )	// '...' was declared deprecated
 #endif