diff --git a/glm/core/func_common.inl b/glm/core/func_common.inl
index 53990a6c..e2801089 100644
--- a/glm/core/func_common.inl
+++ b/glm/core/func_common.inl
@@ -1206,7 +1206,7 @@ namespace glm
 	{
 		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'mix' only accept floating-point inputs");
 
-#if(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_VC)
+#if(GLM_COMPILER & GLM_COMPILER_VC)
 		return typename genType::bool_type(_isnan(x));
 #else
 		return typename genType::bool_type(std::isnan(x));
@@ -1257,7 +1257,7 @@ namespace glm
 	{
 		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'isinf' only accept floating-point inputs");
 
-#if(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_VC)
+#if(GLM_COMPILER & GLM_COMPILER_VC)
 		return typename genType::bool_type(_fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF);
 #else
 		return typename genType::bool_type(std::isinf(x));
diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp
index a7098d68..07f32498 100644
--- a/glm/core/setup.hpp
+++ b/glm/core/setup.hpp
@@ -167,13 +167,13 @@
 // Report compiler detection
 #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_COMPILER_DISPLAYED))
 #	define GLM_MESSAGE_COMPILER_DISPLAYED
-#	if(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_VC)
+#	if(GLM_COMPILER & GLM_COMPILER_VC)
 #		pragma message("GLM: Visual C++ compiler detected")
-#	elif(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_GCC)
+#	elif(GLM_COMPILER & GLM_COMPILER_GCC)
 #		pragma message("GLM: GCC compiler detected")
-#	elif(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_BC)
+#	elif(GLM_COMPILER & GLM_COMPILER_BC)
 #		pragma message("GLM: Borland compiler detected but not supported")
-#	elif(defined(GLM_COMPILER) && GLM_COMPILER & GLM_COMPILER_CODEWARRIOR)
+#	elif(GLM_COMPILER & GLM_COMPILER_CODEWARRIOR)
 #		pragma message("GLM: Codewarrior compiler detected but not supported")
 #	else
 #		pragma message("GLM: Compiler not detected")
diff --git a/glm/gtx/compatibility.inl b/glm/gtx/compatibility.inl
index 85fb81b1..ef7d57c9 100644
--- a/glm/gtx/compatibility.inl
+++ b/glm/gtx/compatibility.inl
@@ -16,9 +16,9 @@ template <typename genType>
 inline bool isfinite(
 	genType const & x)
 {
-#ifdef GLM_COMPILER_VC
+#if(GLM_COMPILER & GLM_COMPILER_VC)
 	return _finite(x);
-#else//GLM_COMPILER_GCC
+#else//(GLM_COMPILER & GLM_COMPILER_GCC)
 	return std::isfinite(x);
 #endif
 }
@@ -58,7 +58,7 @@ template <typename genType>
 inline bool isinf(
 	genType const & x)
 {
-#if(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_VC))
+#if(GLM_COMPILER & GLM_COMPILER_VC)
 	return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
 #else
 	return std::isinf(x);
@@ -99,7 +99,7 @@ inline detail::tvec4<bool> isinf(
 template <typename genType> 
 inline bool isnan(genType const & x)
 {
-#if(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_VC))
+#if(GLM_COMPILER & GLM_COMPILER_VC)
 	return _isnan(x);
 #else
 	return std::isnan(x);