mixer: Use lsu_merge_config_file_options().

[paraslash.git] / stdout.h

diff --git a/stdout.h b/stdout.h
index dbf8866b368f16d800ab90e799a71e07ff726954..114c44f492add74d7e42e7bfdd2c0dde02f92698 100644 (file)
--- a/stdout.h
+++ b/stdout.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file stdout.h Writing to stdout via buffer trees. */
 
@@ -13,7 +9,7 @@
  */
 struct stdout_task {
        /** The task structure used by the scheduler. */
-       struct task task;
+       struct task *task;
        /** Stdout is always a leaf node in the buffer tree. */
        struct btr_node *btrn;
        /** The descriptor flags of STDOUT at startup. */
@@ -22,4 +18,4 @@ struct stdout_task {
        bool must_set_nonblock_flag;
 };
 
-void stdout_set_defaults(struct stdout_task *sot);
+void stdout_task_register(struct stdout_task *sot, struct sched *s);