From: Juanma Barranquero <lekktu@gmail.com>
Date: Sun, 4 Jul 2010 13:41:55 +0000 (+0200)
Subject: Fix more prototypes.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~81^2~41
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e5447b22e975b57094fb6089bf98a238d29fd710;p=emacs.git

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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e947aa7969..8be43ce844b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,11 +2,14 @@
 
 	Fix prototypes.
 
+	* atimer.c (start_atimer): Use EMACS_TIME, not struct timeval.
 	* 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".
+	* sysdep.c (set_file_times): Use EMACS_TIME, not struct timeval.
+	* xgselect.c (xg_select): Use SELECT_TYPE, EMACS_TIME.
 
 2010-07-04  Dan Nicolaescu  <dann@ics.uci.edu>
 
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);
    to cancel_atimer; don't free it yourself.  */
 
 struct atimer *
-start_atimer (enum atimer_type type, struct timeval time, atimer_callback fn, void *client_data)
+start_atimer (enum atimer_type type, EMACS_TIME time, atimer_callback fn,
+	      void *client_data)
 {
   struct atimer *t;
 
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 */)
 
 
 int
-set_file_times (const char *filename, struct timeval atime, struct timeval mtime)
+set_file_times (const char *filename, EMACS_TIME atime, EMACS_TIME mtime)
 {
 #ifdef HAVE_UTIMES
   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;
 static int gfds_size;
 
 int
-xg_select (int max_fds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *timeout)
+xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
+	   EMACS_TIME *timeout)
 {
   SELECT_TYPE all_rfds, all_wfds;
   EMACS_TIME tmo, *tmop = timeout;