Merge branch 'master' into next

[paraslash.git] / fade.c

diff --git a/fade.c b/fade.c
index 1e37efd5def104763d6137d32642858b9cd96d93..eaeaf0563e51788a6140e42e472036e84a34deea 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -6,13 +6,9 @@
 
 /** \file fade.c A volume fader and alarm clock for linux. */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
-
-#include "fade.cmdline.h"
-#include "para.h"
-#include "fd.h"
-
 #include <sys/ioctl.h>
 #include <ctype.h>
 #include <stdlib.h> /* EXIT_SUCCESS */
@@ -21,12 +17,15 @@
 #include <string.h>
 #include <limits.h>
 #include <sys/soundcard.h>
+
+#include "fade.cmdline.h"
+#include "para.h"
+#include "fd.h"
 #include "string.h"
 #include "error.h"
 
-
 INIT_FADE_ERRLISTS;
-struct fade_args_info conf;
+static struct fade_args_info conf;
 
 __printf_2_3 void para_log(__a_unused int ll, const char *fmt, ...)
 {