diff options
| author | Paul Eggert | 2011-09-06 13:47:45 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-09-06 13:47:45 -0700 |
| commit | c8199d0f9eb45a99de074ec10b893f737f738cd8 (patch) | |
| tree | ce31864f7f951b86b84a9f8cd2ae8c33c4883341 /src/floatfns.c | |
| parent | 369e19fc45a4c2d4bf84da0d8e3f27050624a38c (diff) | |
| download | emacs-c8199d0f9eb45a99de074ec10b893f737f738cd8.tar.gz emacs-c8199d0f9eb45a99de074ec10b893f737f738cd8.zip | |
isnan: Fix porting problem to Solaris 10 with bundled gcc.
Without this fix, the command to link temacs failed due to an
undefined symbol __builtin_isnan. This is because
/usr/include/iso/math_c99.h #defines isnan(x) to
__builtin_isnan(x), but the bundled gcc, which identifies itself
as gcc 3.4.3 (csl-sol210-3_4-branch+sol_rpath), does not have
a __builtin_isnan.
* configure.in (isnan): Remove now-unnecessary check.
* src/floatfns.c (isnan): #undef, and then #define to a clone of
what's in data.c.
(Fisnan): Always define, since it's always available now.
(syms_of_floatfns): Always define isnan at the Lisp level.
Diffstat (limited to 'src/floatfns.c')
| -rw-r--r-- | src/floatfns.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/floatfns.c b/src/floatfns.c index 89aa052e8b1..81cf6bdb61f 100644 --- a/src/floatfns.c +++ b/src/floatfns.c | |||
| @@ -282,7 +282,9 @@ DEFUN ("tan", Ftan, Stan, 1, 1, 0, | |||
| 282 | return make_float (d); | 282 | return make_float (d); |
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | #if defined HAVE_ISNAN && defined HAVE_COPYSIGN | 285 | #undef isnan |
| 286 | #define isnan(x) ((x) != (x)) | ||
| 287 | |||
| 286 | DEFUN ("isnan", Fisnan, Sisnan, 1, 1, 0, | 288 | DEFUN ("isnan", Fisnan, Sisnan, 1, 1, 0, |
| 287 | doc: /* Return non nil iff argument X is a NaN. */) | 289 | doc: /* Return non nil iff argument X is a NaN. */) |
| 288 | (Lisp_Object x) | 290 | (Lisp_Object x) |
| @@ -291,6 +293,7 @@ DEFUN ("isnan", Fisnan, Sisnan, 1, 1, 0, | |||
| 291 | return isnan (XFLOAT_DATA (x)) ? Qt : Qnil; | 293 | return isnan (XFLOAT_DATA (x)) ? Qt : Qnil; |
| 292 | } | 294 | } |
| 293 | 295 | ||
| 296 | #ifdef HAVE_COPYSIGN | ||
| 294 | DEFUN ("copysign", Fcopysign, Scopysign, 1, 2, 0, | 297 | DEFUN ("copysign", Fcopysign, Scopysign, 1, 2, 0, |
| 295 | doc: /* Copy sign of X2 to value of X1, and return the result. | 298 | doc: /* Copy sign of X2 to value of X1, and return the result. |
| 296 | Cause an error if X1 or X2 is not a float. */) | 299 | Cause an error if X1 or X2 is not a float. */) |
| @@ -1030,8 +1033,8 @@ syms_of_floatfns (void) | |||
| 1030 | defsubr (&Scos); | 1033 | defsubr (&Scos); |
| 1031 | defsubr (&Ssin); | 1034 | defsubr (&Ssin); |
| 1032 | defsubr (&Stan); | 1035 | defsubr (&Stan); |
| 1033 | #if defined HAVE_ISNAN && defined HAVE_COPYSIGN | ||
| 1034 | defsubr (&Sisnan); | 1036 | defsubr (&Sisnan); |
| 1037 | #ifdef HAVE_COPYSIGN | ||
| 1035 | defsubr (&Scopysign); | 1038 | defsubr (&Scopysign); |
| 1036 | defsubr (&Sfrexp); | 1039 | defsubr (&Sfrexp); |
| 1037 | defsubr (&Sldexp); | 1040 | defsubr (&Sldexp); |