Merge from trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/floatfns.c b/src/floatfns.c
index 4c1548cfd8f..1c3e40eefde 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -117,7 +117,7 @@ static int in_float;
 
 static Lisp_Object float_error_arg, float_error_arg2;
 
-static char *float_error_fn_name;
+static const char *float_error_fn_name;
 
 /* Evaluate the floating point expression D, recording NUM
    as the original argument for error messages.
@@ -746,7 +746,7 @@ static Lisp_Object
 rounding_driver (Lisp_Object arg, Lisp_Object divisor,
                  double (*double_round) (double),
                  EMACS_INT (*int_round2) (EMACS_INT, EMACS_INT),
-                 char *name)
+                 const char *name)
 {
   CHECK_NUMBER_OR_FLOAT (arg);