diff --git a/configure b/configure
index ed6e582a39..2b5ae78e96 100755
--- a/configure
+++ b/configure
@@ -306,6 +306,7 @@ SunOS)
         audio_drv_list="oss"
     fi
     audio_possible_drivers="oss sdl"
+    OS_CFLAGS=-std=gnu99
 ;;
 AIX)
 aix="yes"
diff --git a/fpu/softfloat-native.c b/fpu/softfloat-native.c
index 99471b34cd..2af07a3f8f 100644
--- a/fpu/softfloat-native.c
+++ b/fpu/softfloat-native.c
@@ -2,6 +2,9 @@
    context is supported */
 #include "softfloat.h"
 #include <math.h>
+#if defined(HOST_SOLARIS)
+#include <fenv.h>
+#endif
 
 void set_float_rounding_mode(int val STATUS_PARAM)
 {
diff --git a/fpu/softfloat-native.h b/fpu/softfloat-native.h
index 6b3a20e14a..a28c769472 100644
--- a/fpu/softfloat-native.h
+++ b/fpu/softfloat-native.h
@@ -20,7 +20,7 @@
  *   are defined in <iso/math_c99.h> with a compiler directive
  */
 #if defined(HOST_SOLARIS) && (( HOST_SOLARIS <= 9 ) || ((HOST_SOLARIS >= 10) \
-                                                        && (__GNUC__ <= 4))) \
+                                                        && (__GNUC__ < 4))) \
     || (defined(__OpenBSD__) && (OpenBSD < 200811))
 /*
  * C99 7.12.3 classification macros