2 files changed, 7 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4ad5cc11716..859a6465f85 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2006-07-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * syntax.c (Fforward_comment): Fix int-32 vs EMACS_INT-64 mixup.
+
         * lread.c (read_filtered_event): Remove `register' qualifier because it
         causes compilation problem with gcc-4.0.2-20051125 on amd64.
         (readevalloop): Remove unused var `bpos'.
diff --git a/src/syntax.c b/src/syntax.c
index 9af4773a01b..d72fe4636db 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1992,16 +1992,16 @@ between them, return t; otherwise return nil.  */)
      (count)
      Lisp_Object count;
 {
-  register int from;
-  int from_byte;
-  register int stop;
+  register EMACS_INT from;
+  EMACS_INT from_byte;
+  register EMACS_INT stop;
   register int c, c1;
   register enum syntaxcode code;
   int comstyle = 0;         /* style of comment encountered */
   int comnested = 0;        /* whether the comment is nestable or not */
   int found;
-  int count1;
-  int out_charpos, out_bytepos;
+  EMACS_INT count1;
+  EMACS_INT out_charpos, out_bytepos;
   int dummy;
 
   CHECK_NUMBER (count);