2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a2ada806de5..75c2a01d2d2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * macros.c (Fstart_kbd_macro): Simplify.
+        This works around a GCC compiler bug when Emacs is configured with
+        --enable-gcc-warnings.
+
 2014-07-14  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * lisp.h (CHECK_VECTOR_OR_STRING): Return number of elements
diff --git a/src/macros.c b/src/macros.c
index c73986abd34..07667f09431 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -80,7 +80,7 @@ macro before appending to it.  */)
     }
   else
     {
-      const ptrdiff_t incr = 30;
+      int incr = 30;
       ptrdiff_t i, len;
       bool cvt;