merge trunk

1 files changed, 2 insertions, 3 deletions

diff --git a/src/casefiddle.c b/src/casefiddle.c
index 19fbc832288..81e84252b72 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -114,12 +114,11 @@ casify_object (enum case_action flag, Lisp_Object obj)
       ptrdiff_t i, i_byte, size = SCHARS (obj);
       int len;
       USE_SAFE_ALLOCA;
-      unsigned char *dst, *o;
       ptrdiff_t o_size = (size < STRING_BYTES_BOUND / MAX_MULTIBYTE_LENGTH
                           ? size * MAX_MULTIBYTE_LENGTH
                           : STRING_BYTES_BOUND);
-      SAFE_ALLOCA (dst, void *, o_size);
-      o = dst;
+      unsigned char *dst = SAFE_ALLOCA (o_size);
+      unsigned char *o = dst;
 
       for (i = i_byte = 0; i < size; i++, i_byte += len)
         {