summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog6
-rw-r--r--src/floatfns.c13
2 files changed, 13 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3bd9dce4fb7..b534e0a1ab0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-23 Paul Eggert <eggert@cs.ucla.edu>
+
+ Port to Solaris 10 and its bundled GCC.
+ Problem reported by Timothy C. Burt.
+ * floatfns.c (isfinite, isnan): Redefine unconditionally.
+
2013-10-21 Dmitry Antipov <dmantipov@yandex.ru>
Do not allow font caches to grow too large.
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
-# define isfinite(x) ((x) - (x) == 0)
-#endif
-#ifndef isnan
-# define isnan(x) ((x) != (x))
-#endif
+/* 'isfinite' and 'isnan' cause build failures on Solaris 10 with the
+ bundled GCC in c99 mode. Work around the bugs with simple
+ implementations that are good enough. */
+#undef isfinite
+#define isfinite(x) ((x) - (x) == 0)
+#undef isnan
+#define isnan(x) ((x) != (x))
/* Check that X is a floating point number. */