diff options
| author | Stefan Monnier | 2006-07-07 16:52:13 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2006-07-07 16:52:13 +0000 |
| commit | dd9f0dcd8f1576b5d59009ffce6526c69a290a7a (patch) | |
| tree | 760e699fbc2289636fb0ec99fb5261cc7acf4865 /src | |
| parent | 2850984d60887027852b6a10a50070ae9c33affc (diff) | |
| download | emacs-dd9f0dcd8f1576b5d59009ffce6526c69a290a7a.tar.gz emacs-dd9f0dcd8f1576b5d59009ffce6526c69a290a7a.zip | |
(Fforward_comment): Fix int-32 vs EMACS_INT-64 mixup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/syntax.c | 10 |
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 @@ | |||
| 1 | 2006-07-07 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2006-07-07 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * syntax.c (Fforward_comment): Fix int-32 vs EMACS_INT-64 mixup. | ||
| 4 | |||
| 3 | * lread.c (read_filtered_event): Remove `register' qualifier because it | 5 | * lread.c (read_filtered_event): Remove `register' qualifier because it |
| 4 | causes compilation problem with gcc-4.0.2-20051125 on amd64. | 6 | causes compilation problem with gcc-4.0.2-20051125 on amd64. |
| 5 | (readevalloop): Remove unused var `bpos'. | 7 | (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. */) | |||
| 1992 | (count) | 1992 | (count) |
| 1993 | Lisp_Object count; | 1993 | Lisp_Object count; |
| 1994 | { | 1994 | { |
| 1995 | register int from; | 1995 | register EMACS_INT from; |
| 1996 | int from_byte; | 1996 | EMACS_INT from_byte; |
| 1997 | register int stop; | 1997 | register EMACS_INT stop; |
| 1998 | register int c, c1; | 1998 | register int c, c1; |
| 1999 | register enum syntaxcode code; | 1999 | register enum syntaxcode code; |
| 2000 | int comstyle = 0; /* style of comment encountered */ | 2000 | int comstyle = 0; /* style of comment encountered */ |
| 2001 | int comnested = 0; /* whether the comment is nestable or not */ | 2001 | int comnested = 0; /* whether the comment is nestable or not */ |
| 2002 | int found; | 2002 | int found; |
| 2003 | int count1; | 2003 | EMACS_INT count1; |
| 2004 | int out_charpos, out_bytepos; | 2004 | EMACS_INT out_charpos, out_bytepos; |
| 2005 | int dummy; | 2005 | int dummy; |
| 2006 | 2006 | ||
| 2007 | CHECK_NUMBER (count); | 2007 | CHECK_NUMBER (count); |