diff options
| author | Juanma Barranquero | 2010-07-04 13:51:28 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-07-04 13:51:28 +0200 |
| commit | 438105ed4d403c48cc452cd70891f04bbcdad347 (patch) | |
| tree | 1f35fdb31d3de15b9a5a6f8782f154eea03ead21 /src/regex.c | |
| parent | 820ae8fefa06d43cf543ad62a04f98048358de7c (diff) | |
| download | emacs-438105ed4d403c48cc452cd70891f04bbcdad347.tar.gz emacs-438105ed4d403c48cc452cd70891f04bbcdad347.zip | |
Fix prototypes.
* dired.c (file_name_completion_stat): Use DIRENTRY, not struct dirent.
* fileio.c (read_non_regular, read_non_regular_quit): Pass Lisp_Object,
as required by internal_condition_case_1.
* regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object.
(analyse_first): Fix "const const".
Diffstat (limited to 'src/regex.c')
| -rw-r--r-- | src/regex.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/regex.c b/src/regex.c index 67efee37d82..10ab857b00a 100644 --- a/src/regex.c +++ b/src/regex.c | |||
| @@ -3984,7 +3984,7 @@ group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum) | |||
| 3984 | Return -1 if fastmap was not updated accurately. */ | 3984 | Return -1 if fastmap was not updated accurately. */ |
| 3985 | 3985 | ||
| 3986 | static int | 3986 | static int |
| 3987 | analyse_first (const re_char *p, const re_char *pend, char *fastmap, const const int multibyte) | 3987 | analyse_first (const re_char *p, const re_char *pend, char *fastmap, const int multibyte) |
| 3988 | { | 3988 | { |
| 3989 | int j, k; | 3989 | int j, k; |
| 3990 | boolean not; | 3990 | boolean not; |
| @@ -6385,7 +6385,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int | |||
| 6385 | bytes; nonzero otherwise. */ | 6385 | bytes; nonzero otherwise. */ |
| 6386 | 6386 | ||
| 6387 | static int | 6387 | static int |
| 6388 | bcmp_translate (const re_char *s1, const re_char *s2, register int len, Lisp_Object translate, const const int target_multibyte) | 6388 | bcmp_translate (const re_char *s1, const re_char *s2, register int len, |
| 6389 | RE_TRANSLATE_TYPE translate, const int target_multibyte) | ||
| 6389 | { | 6390 | { |
| 6390 | register re_char *p1 = s1, *p2 = s2; | 6391 | register re_char *p1 = s1, *p2 = s2; |
| 6391 | re_char *p1_end = s1 + len; | 6392 | re_char *p1_end = s1 + len; |