aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-16 00:47:02 -0700
committerPaul Eggert2011-03-16 00:47:02 -0700
commita885e2ed791b15dc48a7024751872d2b5bc17034 (patch)
treeebba6e97a9dd68f840c2ad5b0104bae14484f9b0 /src
parent1384fa33581c398a3f3393c82be071d5784b0b04 (diff)
downloademacs-a885e2ed791b15dc48a7024751872d2b5bc17034.tar.gz
emacs-a885e2ed791b15dc48a7024751872d2b5bc17034.zip
* floatfns.c (Ffrexp, Fldexp): Rename locals to avoid shadowing.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/floatfns.c12
2 files changed, 7 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f57fa6d9e0f..131d2af5a49 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
12011-03-16 Paul Eggert <eggert@cs.ucla.edu> 12011-03-16 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * floatfns.c (domain_error2): Define only if needed. 3 * floatfns.c (domain_error2): Define only if needed.
4 (Ffrexp, Fldexp): Rename locals to avoid shadowing.
4 5
5 * alloc.c (mark_backtrace): Move decl from here ... 6 * alloc.c (mark_backtrace): Move decl from here ...
6 * lisp.h: ... to here, so that it can be checked. 7 * lisp.h: ... to here, so that it can be checked.
diff --git a/src/floatfns.c b/src/floatfns.c
index c8b5236d34a..bc03509b757 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -328,9 +328,9 @@ If X is zero, both parts (SGNFCAND and EXP) are zero. */)
328 return Fcons (make_float (0.0), make_number (0)); 328 return Fcons (make_float (0.0), make_number (0));
329 else 329 else
330 { 330 {
331 int exp; 331 int exponent;
332 double sgnfcand = frexp (f, &exp); 332 double sgnfcand = frexp (f, &exponent);
333 return Fcons (make_float (sgnfcand), make_number (exp)); 333 return Fcons (make_float (sgnfcand), make_number (exponent));
334 } 334 }
335} 335}
336 336
@@ -338,10 +338,10 @@ DEFUN ("ldexp", Fldexp, Sldexp, 1, 2, 0,
338 doc: /* Construct number X from significand SGNFCAND and exponent EXP. 338 doc: /* Construct number X from significand SGNFCAND and exponent EXP.
339Returns the floating point value resulting from multiplying SGNFCAND 339Returns the floating point value resulting from multiplying SGNFCAND
340(the significand) by 2 raised to the power of EXP (the exponent). */) 340(the significand) by 2 raised to the power of EXP (the exponent). */)
341 (Lisp_Object sgnfcand, Lisp_Object exp) 341 (Lisp_Object sgnfcand, Lisp_Object exponent)
342{ 342{
343 CHECK_NUMBER (exp); 343 CHECK_NUMBER (exponent);
344 return make_float (ldexp (XFLOATINT (sgnfcand), XINT (exp))); 344 return make_float (ldexp (XFLOATINT (sgnfcand), XINT (exponent)));
345} 345}
346#endif 346#endif
347 347