Merge branch 't/ogg_timining_fixes'

[paraslash.git] / sched.h

diff --git a/sched.h b/sched.h
index 7681567be31534e3ef98af3dc19f16f0958290d7..7158a8732c314b88ad1e162cbb6743c710d01240 100644 (file)
--- a/sched.h
+++ b/sched.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -20,14 +20,14 @@ struct sched {
        /** Initial value before any pre_select call. */
        struct timeval default_timeout;
        /** The current timeout for the upcoming select call. */
-       struct timeval timeout;
+       struct timeval select_timeout;
        /** fds that should be watched for readability. */
        fd_set rfds;
        /** fds that should be watched for writability. */
        fd_set wfds;
        /** Highest numbered file descriptor in any of the above fd sets. */
        int max_fileno;
-       /** In non-NULL, use this function instead of para_select. */
+       /** If non-NULL, use this function instead of para_select. */
        int (*select_function)(int, fd_set *, fd_set *, struct timeval *);
 };
 
@@ -80,7 +80,7 @@ char *get_task_list(void);
 int kill_task(char *id);
 void sched_shutdown(void);
 void sched_min_delay(struct sched *s);
-void sched_request_timeout(struct timeval *timeout, struct sched *s);
+void sched_request_timeout(struct timeval *to, struct sched *s);
 void sched_request_timeout_ms(long unsigned ms, struct sched *s);
 void sched_request_barrier(struct timeval *barrier, struct sched *s);
 void sched_request_barrier_or_min_delay(struct timeval *barrier, struct sched *s);