diff options
| author | Bill Wohler | 2013-02-18 10:11:43 -0800 |
|---|---|---|
| committer | Bill Wohler | 2013-02-18 10:11:43 -0800 |
| commit | 21733e4f154f8830fa568a347a0d6dbd59793c2b (patch) | |
| tree | 3170dbbcdfafeb42f6c381d6b80b251e9f31b788 /src/floatfns.c | |
| parent | 6d14beddb06b5ae86f9dd770a1661ebd24846f28 (diff) | |
| parent | 587feed443522f738b65b57b22a31cc8a25525c5 (diff) | |
| download | emacs-21733e4f154f8830fa568a347a0d6dbd59793c2b.tar.gz emacs-21733e4f154f8830fa568a347a0d6dbd59793c2b.zip | |
Merge from trunk; up to 2013-02-18T01:30:27Z!monnier@iro.umontreal.ca.
Diffstat (limited to 'src/floatfns.c')
| -rw-r--r-- | src/floatfns.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/floatfns.c b/src/floatfns.c index 645a5957609..43576a16248 100644 --- a/src/floatfns.c +++ b/src/floatfns.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* Primitive operations on floating point for GNU Emacs Lisp interpreter. | 1 | /* Primitive operations on floating point for GNU Emacs Lisp interpreter. |
| 2 | 2 | ||
| 3 | Copyright (C) 1988, 1993-1994, 1999, 2001-2012 | 3 | Copyright (C) 1988, 1993-1994, 1999, 2001-2013 Free Software Foundation, |
| 4 | Free Software Foundation, Inc. | 4 | Inc. |
| 5 | 5 | ||
| 6 | Author: Wolfgang Rupprecht | 6 | Author: Wolfgang Rupprecht |
| 7 | (according to ack.texi) | 7 | (according to ack.texi) |
| @@ -399,8 +399,8 @@ round2 (EMACS_INT i1, EMACS_INT i2) | |||
| 399 | odd. */ | 399 | odd. */ |
| 400 | EMACS_INT q = i1 / i2; | 400 | EMACS_INT q = i1 / i2; |
| 401 | EMACS_INT r = i1 % i2; | 401 | EMACS_INT r = i1 % i2; |
| 402 | EMACS_INT abs_r = r < 0 ? -r : r; | 402 | EMACS_INT abs_r = eabs (r); |
| 403 | EMACS_INT abs_r1 = (i2 < 0 ? -i2 : i2) - abs_r; | 403 | EMACS_INT abs_r1 = eabs (i2) - abs_r; |
| 404 | return q + (abs_r + (q & 1) <= abs_r1 ? 0 : (i2 ^ r) < 0 ? -1 : 1); | 404 | return q + (abs_r + (q & 1) <= abs_r1 ? 0 : (i2 ^ r) < 0 ? -1 : 1); |
| 405 | } | 405 | } |
| 406 | 406 | ||