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/fileio.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/fileio.c')
| -rw-r--r-- | src/fileio.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; | |||
| 3248 | 3248 | ||
| 3249 | 3249 | ||
| 3250 | /* Read from a non-regular file. | 3250 | /* Read from a non-regular file. |
| 3251 | Read non_regular_trytry bytes max from non_regular_fd. | 3251 | Read non_regular_nbytes bytes max from non_regular_fd. |
| 3252 | Non_regular_inserted specifies where to put the read bytes. | 3252 | Non_regular_inserted specifies where to put the read bytes. |
| 3253 | Value is the number of bytes read. */ | 3253 | Value is the number of bytes read. */ |
| 3254 | 3254 | ||
| 3255 | static Lisp_Object | 3255 | static Lisp_Object |
| 3256 | read_non_regular (void) | 3256 | read_non_regular (Lisp_Object ignored) |
| 3257 | { | 3257 | { |
| 3258 | EMACS_INT nbytes; | 3258 | EMACS_INT nbytes; |
| 3259 | 3259 | ||
| @@ -3271,7 +3271,7 @@ read_non_regular (void) | |||
| 3271 | in insert-file-contents. */ | 3271 | in insert-file-contents. */ |
| 3272 | 3272 | ||
| 3273 | static Lisp_Object | 3273 | static Lisp_Object |
| 3274 | read_non_regular_quit (void) | 3274 | read_non_regular_quit (Lisp_Object ignored) |
| 3275 | { | 3275 | { |
| 3276 | return Qnil; | 3276 | return Qnil; |
| 3277 | } | 3277 | } |