1 files changed, 3 insertions, 2 deletions

diff --git a/src/coding.c b/src/coding.c
index 17e342298b9..64826ae16b9 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -288,8 +288,8 @@ encode_coding_XXX (struct coding_system *coding)
 #include <setjmp.h>
 
 #include "lisp.h"
-#include "buffer.h"
 #include "character.h"
+#include "buffer.h"
 #include "charset.h"
 #include "ccl.h"
 #include "composite.h"
@@ -6765,7 +6765,8 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table,
 
       while (buf < buf_end)
         {
-          int c = *buf, i;
+          int c = *buf;
+          ptrdiff_t i;
 
           if (c >= 0)
             {