diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/dired.c | 4 | ||||
| -rw-r--r-- | src/fileio.c | 6 | ||||
| -rw-r--r-- | src/regex.c | 5 |
4 files changed, 18 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index eeb6e30d66c..2e947aa7969 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2010-07-04 Juanma Barranquero <lekktu@gmail.com> + + 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". + 2010-07-04 Dan Nicolaescu <dann@ics.uci.edu> * alloc.c: Convert function definitions to standard C. diff --git a/src/dired.c b/src/dired.c index b5ee1546306..69a6a4390c4 100644 --- a/src/dired.c +++ b/src/dired.c @@ -472,7 +472,7 @@ These are all file names in directory DIRECTORY which begin with FILE. */) return file_name_completion (file, directory, 1, 0, Qnil); } -static int file_name_completion_stat (Lisp_Object dirname, struct dirent *dp, struct stat *st_addr); +static int file_name_completion_stat (Lisp_Object dirname, DIRENTRY *dp, struct stat *st_addr); Lisp_Object Qdefault_directory; Lisp_Object @@ -839,7 +839,7 @@ scmp (register unsigned char *s1, register unsigned char *s2, int len) } static int -file_name_completion_stat (Lisp_Object dirname, struct dirent *dp, struct stat *st_addr) +file_name_completion_stat (Lisp_Object dirname, DIRENTRY *dp, struct stat *st_addr) { int len = NAMLEN (dp); int pos = SCHARS (dirname); diff --git a/src/fileio.c b/src/fileio.c index c81dc6705c7..0f80d572794 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -3248,12 +3248,12 @@ static EMACS_INT non_regular_nbytes; /* Read from a non-regular file. - Read non_regular_trytry bytes max from non_regular_fd. + Read non_regular_nbytes bytes max from non_regular_fd. Non_regular_inserted specifies where to put the read bytes. Value is the number of bytes read. */ static Lisp_Object -read_non_regular (void) +read_non_regular (Lisp_Object ignored) { EMACS_INT nbytes; @@ -3271,7 +3271,7 @@ read_non_regular (void) in insert-file-contents. */ static Lisp_Object -read_non_regular_quit (void) +read_non_regular_quit (Lisp_Object ignored) { return Qnil; } 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) Return -1 if fastmap was not updated accurately. */ static int -analyse_first (const re_char *p, const re_char *pend, char *fastmap, const const int multibyte) +analyse_first (const re_char *p, const re_char *pend, char *fastmap, const int multibyte) { int j, k; boolean not; @@ -6385,7 +6385,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int bytes; nonzero otherwise. */ static int -bcmp_translate (const re_char *s1, const re_char *s2, register int len, Lisp_Object translate, const const int target_multibyte) +bcmp_translate (const re_char *s1, const re_char *s2, register int len, + RE_TRANSLATE_TYPE translate, const int target_multibyte) { register re_char *p1 = s1, *p2 = s2; re_char *p1_end = s1 + len; |