Merge branch 'master' into next

[paraslash.git] / sched.h

diff --git a/sched.h b/sched.h
index 86afc6fca3ed48defaaf164e929164d77a2d56fc..26aaabe9a5678621b9e3fe4d1ba4c27d34fbfb4f 100644 (file)
--- a/sched.h
+++ b/sched.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -27,6 +27,8 @@ struct sched {
        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. */
+       int (*select_function)(int, fd_set *, fd_set *, struct timeval *);
 };
 
 /**
@@ -73,7 +75,6 @@ struct task {
 extern struct timeval *now;
 
 void register_task(struct task *t);
-void unregister_task(struct task *t);
 int schedule(struct sched *s);
 char *get_task_list(void);
 int kill_task(char *id);