* floatfns.c (Ffrexp, Fldexp): Rename locals to avoid shadowing.

diff --git a/src/ChangeLog b/src/ChangeLog
index f57fa6d9e0f8ec939a10f7429179d9e951c237e8..131d2af5a494bc59863a697c3935586342286f19 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2011-03-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        * floatfns.c (domain_error2): Define only if needed.
+       (Ffrexp, Fldexp): Rename locals to avoid shadowing.
 
        * alloc.c (mark_backtrace): Move decl from here ...
        * lisp.h: ... to here, so that it can be checked.

diff --git a/src/floatfns.c b/src/floatfns.c
index c8b5236d34a72a7af3901aee6a61610e97e96b53..bc03509b7579a7cc443c63c9ae7ab345bdb4b068 100644 (file)
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -328,9 +328,9 @@ If X is zero, both parts (SGNFCAND and EXP) are zero.  */)
     return Fcons (make_float (0.0), make_number (0));
   else
     {
-      int    exp;
-      double sgnfcand = frexp (f, &exp);
-      return Fcons (make_float (sgnfcand), make_number (exp));
+      int exponent;
+      double sgnfcand = frexp (f, &exponent);
+      return Fcons (make_float (sgnfcand), make_number (exponent));
     }
 }
 
@@ -338,10 +338,10 @@ DEFUN ("ldexp", Fldexp, Sldexp, 1, 2, 0,
        doc: /* Construct number X from significand SGNFCAND and exponent EXP.
 Returns the floating point value resulting from multiplying SGNFCAND
 (the significand) by 2 raised to the power of EXP (the exponent).   */)
-  (Lisp_Object sgnfcand, Lisp_Object exp)
+  (Lisp_Object sgnfcand, Lisp_Object exponent)
 {
-  CHECK_NUMBER (exp);
-  return make_float (ldexp (XFLOATINT (sgnfcand), XINT (exp)));
+  CHECK_NUMBER (exponent);
+  return make_float (ldexp (XFLOATINT (sgnfcand), XINT (exponent)));
 }
 #endif
 \f