diff --git a/BaseLib/MemWatch.cpp b/BaseLib/MemWatch.cpp
index 537b127fb065fa26baa0b444445fe1724d91bc06..20a82badef9f9dbcd86f2dbe434bd70ca966b95f 100644
--- a/BaseLib/MemWatch.cpp
+++ b/BaseLib/MemWatch.cpp
@@ -12,7 +12,7 @@
 
 #include "MemWatch.h"
 
-#ifndef WIN32
+#ifndef _MSC_VER
 
 namespace BaseLib {
 
@@ -71,4 +71,4 @@ unsigned long MemWatch::getCodeMemUsage () {
 
 } // end namespace BaseLib
 
-#endif // WIN
+#endif // _MSC_VER
diff --git a/BaseLib/MemWatch.h b/BaseLib/MemWatch.h
index d34d29426edb20c9776a83a5940b3f860ec52a5e..f3934e90d200708063b39898085c1bf5e2beaafe 100644
--- a/BaseLib/MemWatch.h
+++ b/BaseLib/MemWatch.h
@@ -13,7 +13,7 @@
 #ifndef MEMWATCH_H_
 #define MEMWATCH_H_
 
-#ifndef WIN32
+#ifndef _MSC_VER
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/BaseLib/RunTime.cpp b/BaseLib/RunTime.cpp
index fe517531f49ad14c0c90e18307e646258d6416e9..787b0d9e389fe0518600ee12d2a620ccb00fac22 100644
--- a/BaseLib/RunTime.cpp
+++ b/BaseLib/RunTime.cpp
@@ -16,7 +16,7 @@ namespace BaseLib {
 
 void RunTime::start()
 {
-#ifndef _WIN32
+#ifndef _MSC_VER
 	gettimeofday(&_start, 0);
 #else
 	_start = timeGetTime();
@@ -25,7 +25,7 @@ void RunTime::start()
 
 void RunTime::stop()
 {
-#ifndef _WIN32
+#ifndef _MSC_VER
 	gettimeofday(&_stop, 0);
 #else
 	_stop = timeGetTime();
@@ -34,7 +34,7 @@ void RunTime::stop()
 
 double RunTime::elapsed()
 {
-#ifndef _WIN32
+#ifndef _MSC_VER
 	return (_stop.tv_sec + _stop.tv_usec/1000000.0 - (_start.tv_sec + _start.tv_usec/1000000.0));
 #else
 	return (_stop - _start) / 1000.0;
diff --git a/BaseLib/RunTime.h b/BaseLib/RunTime.h
index bfcc113c17503938bf5e3804379e03d4bc78a443..23a5dc43cbb0db32f74ad6691341a858d0b39775 100644
--- a/BaseLib/RunTime.h
+++ b/BaseLib/RunTime.h
@@ -15,7 +15,7 @@
 
 #include "TimeMeasurementBase.h"
 
-#ifndef _WIN32
+#ifndef _MSC_VER
 #include <sys/time.h>
 #else
 #include <windows.h>
@@ -33,7 +33,7 @@ public:
 	virtual double elapsed();
 	~RunTime() {};
 private:
-#ifndef _WIN32
+#ifndef _MSC_VER
 	timeval _start;
 	timeval _stop;
 #else