Merge branch 'master' into next

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index cc1f716f8a962de165f93d0f090d21e591a43b11..34cea48c6a81ab2d7d6743e28706181415362824 100644 (file)
--- a/write.c
+++ b/write.c
@@ -6,6 +6,7 @@
 
 /** \file write.c Paraslash's standalone wav/raw player. */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -153,7 +154,7 @@ static struct writer_node_group *check_args(void)
                        conf.writer_arg[i], &writer_num);
                if (!g->writer_nodes[i].conf)
                        goto out;
-               g->writer_nodes[i].writer = &writers[writer_num];
+               g->writer_nodes[i].writer_num = writer_num;
        }
        ret = 1;
 out: