projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[paraslash.git]
/
fade.c
diff --git
a/fade.c
b/fade.c
index 40b4623cf2219321ed21970a846f016dce4e1b39..aa7997eb94b87ee34dc8b3d334c9e7a200ddf88d 100644
(file)
--- a/
fade.c
+++ b/
fade.c
@@
-6,25
+6,24
@@
/** \file fade.c A volume fader and alarm clock for linux. */
/** \file fade.c A volume fader and alarm clock for linux. */
+#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
#include <sys/types.h>
#include <dirent.h>
-
-#include "fade.cmdline.h"
-#include "para.h"
-#include "fd.h"
-
-#include <stropts.h>
+#include <sys/ioctl.h>
#include <ctype.h>
#include <stdlib.h> /* EXIT_SUCCESS */
#include <unistd.h>
#include <signal.h>
#include <string.h>
#include <limits.h>
#include <ctype.h>
#include <stdlib.h> /* EXIT_SUCCESS */
#include <unistd.h>
#include <signal.h>
#include <string.h>
#include <limits.h>
-#include <linux/soundcard.h>
+#include <sys/soundcard.h>
+
+#include "fade.cmdline.h"
+#include "para.h"
+#include "fd.h"
#include "string.h"
#include "error.h"
#include "string.h"
#include "error.h"
-
INIT_FADE_ERRLISTS;
struct fade_args_info conf;
INIT_FADE_ERRLISTS;
struct fade_args_info conf;
@@
-217,7
+216,7
@@
static int sweet_dreams(void)
tm->tm_sec = 0;
} else {
t1 += 9 * 60 * 60; /* nine hours from now */
tm->tm_sec = 0;
} else {
t1 += 9 * 60 * 60; /* nine hours from now */
- PARA_INFO_LOG("default wake time: %lu\n", t1);
+ PARA_INFO_LOG("default wake time: %lu\n",
(long unsigned)
t1);
tm = localtime(&t1);
}
wake_time_epoch = mktime(tm);
tm = localtime(&t1);
}
wake_time_epoch = mktime(tm);