diff --git a/redis.c b/redis.c
index e26e676f6..f62533314 100644
--- a/redis.c
+++ b/redis.c
@@ -58,7 +58,8 @@
 #include <sys/resource.h>
 #include <limits.h>
 #include <math.h>
-#if defined(__sun) && defined(__GNUC__)
+
+#if defined(__sun)
 #include "solarisfixes.h"
 #endif
 
diff --git a/solarisfixes.h b/solarisfixes.h
index 36f192016..8786965ae 100644
--- a/solarisfixes.h
+++ b/solarisfixes.h
@@ -1,5 +1,6 @@
 /* Solaris specific fixes */
 
+#if defined(__GNUC__)
 #undef isnan
 #define isnan(x) \
      __extension__({ __typeof (x) __x_a = (x); \
@@ -14,3 +15,4 @@
 #define isinf(x) \
      __extension__ ({ __typeof (x) __x_i = (x); \
      __builtin_expect(!isnan(__x_i) && !isfinite(__x_i), 0); })
+#endif /* __GNUC__ */