diff options
| author | Juanma Barranquero | 2010-07-04 15:41:55 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-07-04 15:41:55 +0200 |
| commit | e5447b22e975b57094fb6089bf98a238d29fd710 (patch) | |
| tree | a6c303a2d8d73b960df36982447ec3b6d7f92632 /src | |
| parent | 438105ed4d403c48cc452cd70891f04bbcdad347 (diff) | |
| download | emacs-e5447b22e975b57094fb6089bf98a238d29fd710.tar.gz emacs-e5447b22e975b57094fb6089bf98a238d29fd710.zip | |
Fix more prototypes.
* atimer.c (start_atimer): Use EMACS_TIME, not struct timeval.
* sysdep.c (set_file_times): Use EMACS_TIME, not struct timeval.
* xgselect.c (xg_select): Use SELECT_TYPE, EMACS_TIME.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/atimer.c | 3 | ||||
| -rw-r--r-- | src/sysdep.c | 2 | ||||
| -rw-r--r-- | src/xgselect.c | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2e947aa7969..8be43ce844b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,11 +2,14 @@ | |||
| 2 | 2 | ||
| 3 | Fix prototypes. | 3 | Fix prototypes. |
| 4 | 4 | ||
| 5 | * atimer.c (start_atimer): Use EMACS_TIME, not struct timeval. | ||
| 5 | * dired.c (file_name_completion_stat): Use DIRENTRY, not struct dirent. | 6 | * dired.c (file_name_completion_stat): Use DIRENTRY, not struct dirent. |
| 6 | * fileio.c (read_non_regular, read_non_regular_quit): Pass Lisp_Object, | 7 | * fileio.c (read_non_regular, read_non_regular_quit): Pass Lisp_Object, |
| 7 | as required by internal_condition_case_1. | 8 | as required by internal_condition_case_1. |
| 8 | * regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object. | 9 | * regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object. |
| 9 | (analyse_first): Fix "const const". | 10 | (analyse_first): Fix "const const". |
| 11 | * sysdep.c (set_file_times): Use EMACS_TIME, not struct timeval. | ||
| 12 | * xgselect.c (xg_select): Use SELECT_TYPE, EMACS_TIME. | ||
| 10 | 13 | ||
| 11 | 2010-07-04 Dan Nicolaescu <dann@ics.uci.edu> | 14 | 2010-07-04 Dan Nicolaescu <dann@ics.uci.edu> |
| 12 | 15 | ||
diff --git a/src/atimer.c b/src/atimer.c index 46c333a9106..23f3915d9c0 100644 --- a/src/atimer.c +++ b/src/atimer.c | |||
| @@ -90,7 +90,8 @@ SIGTYPE alarm_signal_handler (int signo); | |||
| 90 | to cancel_atimer; don't free it yourself. */ | 90 | to cancel_atimer; don't free it yourself. */ |
| 91 | 91 | ||
| 92 | struct atimer * | 92 | struct atimer * |
| 93 | start_atimer (enum atimer_type type, struct timeval time, atimer_callback fn, void *client_data) | 93 | start_atimer (enum atimer_type type, EMACS_TIME time, atimer_callback fn, |
| 94 | void *client_data) | ||
| 94 | { | 95 | { |
| 95 | struct atimer *t; | 96 | struct atimer *t; |
| 96 | 97 | ||
diff --git a/src/sysdep.c b/src/sysdep.c index 60da786c04d..8e783bd7344 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -2579,7 +2579,7 @@ closedir (DIR *dirp /* stream from opendir */) | |||
| 2579 | 2579 | ||
| 2580 | 2580 | ||
| 2581 | int | 2581 | int |
| 2582 | set_file_times (const char *filename, struct timeval atime, struct timeval mtime) | 2582 | set_file_times (const char *filename, EMACS_TIME atime, EMACS_TIME mtime) |
| 2583 | { | 2583 | { |
| 2584 | #ifdef HAVE_UTIMES | 2584 | #ifdef HAVE_UTIMES |
| 2585 | struct timeval tv[2]; | 2585 | struct timeval tv[2]; |
diff --git a/src/xgselect.c b/src/xgselect.c index 5c7e008044d..56e14fe6e14 100644 --- a/src/xgselect.c +++ b/src/xgselect.c | |||
| @@ -29,7 +29,8 @@ static GPollFD *gfds; | |||
| 29 | static int gfds_size; | 29 | static int gfds_size; |
| 30 | 30 | ||
| 31 | int | 31 | int |
| 32 | xg_select (int max_fds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *timeout) | 32 | xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, |
| 33 | EMACS_TIME *timeout) | ||
| 33 | { | 34 | { |
| 34 | SELECT_TYPE all_rfds, all_wfds; | 35 | SELECT_TYPE all_rfds, all_wfds; |
| 35 | EMACS_TIME tmo, *tmop = timeout; | 36 | EMACS_TIME tmo, *tmop = timeout; |