1 files changed, 7 insertions, 6 deletions
diff --git a/src/floatfns.c b/src/floatfns.c
index f3d0936f888..9f0bab2a452 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -46,12 +46,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <math.h>
-#ifndef isfinite
+/* 'isfinite' and 'isnan' cause build failures on Solaris 10 with the
-# define isfinite(x) ((x) - (x) == 0)
+   bundled GCC in c99 mode.  Work around the bugs with simple
-#endif
+   implementations that are good enough.  */
-#ifndef isnan
+#undef isfinite
-# define isnan(x) ((x) != (x))
+#define isfinite(x) ((x) - (x) == 0)
-#endif
+#undef isnan
+#define isnan(x) ((x) != (x))
 /* Check that X is a floating point number.  */

diff --git a/src/floatfns.c b/src/floatfns.c index f3d0936f888..9f0bab2a452 100644 --- a/src/floatfns.c +++ b/src/floatfns.c
@@ -46,12 +46,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
46		46
47	#include <math.h>	47	#include <math.h>
48		48
49	#ifndef isfinite	49	/* 'isfinite' and 'isnan' cause build failures on Solaris 10 with the
50	# define isfinite(x) ((x) - (x) == 0)	50	bundled GCC in c99 mode. Work around the bugs with simple
51	#endif	51	implementations that are good enough. */
52	#ifndef isnan	52	#undef isfinite
53	# define isnan(x) ((x) != (x))	53	#define isfinite(x) ((x) - (x) == 0)
54	#endif	54	#undef isnan
		55	#define isnan(x) ((x) != (x))
55		56
56	/* Check that X is a floating point number. */	57	/* Check that X is a floating point number. */
57		58