|
3438
|
1 |
--- redshift-1.6/configure.ac 2010-10-17 17:27:35.000000000 -0400
|
|
|
2 |
+++ redshift-1.6/configure.ac 2011-04-25 11:15:53.114328593 -0400
|
|
|
3 |
@@ -153,7 +153,7 @@
|
|
|
4 |
|
|
|
5 |
|
|
|
6 |
# Checks for header files.
|
|
|
7 |
-AC_CHECK_HEADERS([locale.h stdint.h stdlib.h string.h unistd.h sys/signal.h])
|
|
|
8 |
+AC_CHECK_HEADERS([locale.h stdint.h stdlib.h string.h unistd.h signal.h])
|
|
|
9 |
|
|
|
10 |
# Checks for typedefs, structures, and compiler characteristics.
|
|
|
11 |
AC_TYPE_UINT16_T
|
|
|
12 |
--- redshift-1.6/src/redshift.c 2011-04-25 11:12:35.752264947 -0400
|
|
|
13 |
+++ redshift-1.6/src/redshift.c 2011-04-25 11:14:44.496435502 -0400
|
|
|
14 |
@@ -30,8 +30,8 @@
|
|
2510
|
15 |
#include <locale.h>
|
|
3438
|
16 |
#include <errno.h>
|
|
|
17 |
|
|
|
18 |
-#ifdef HAVE_SYS_SIGNAL_H
|
|
|
19 |
-# include <sys/signal.h>
|
|
|
20 |
+#ifdef HAVE_SIGNAL_H
|
|
|
21 |
+# include <signal.h>
|
|
|
22 |
#endif
|
|
|
23 |
|
|
|
24 |
#ifdef ENABLE_NLS
|
|
|
25 |
@@ -206,7 +206,7 @@
|
|
|
26 |
} program_mode_t;
|
|
|
27 |
|
|
|
28 |
|
|
|
29 |
-#ifdef HAVE_SYS_SIGNAL_H
|
|
|
30 |
+#ifdef HAVE_SIGNAL_H
|
|
|
31 |
|
|
|
32 |
static volatile sig_atomic_t exiting = 0;
|
|
|
33 |
static volatile sig_atomic_t disable = 0;
|
|
|
34 |
@@ -225,12 +225,12 @@
|
|
|
35 |
disable = 1;
|
|
|
36 |
}
|
|
|
37 |
|
|
|
38 |
-#else /* ! HAVE_SYS_SIGNAL_H */
|
|
|
39 |
+#else /* ! HAVE_SIGNAL_H */
|
|
2510
|
40 |
|
|
3438
|
41 |
static int exiting = 0;
|
|
|
42 |
static int disable = 0;
|
|
|
43 |
|
|
|
44 |
-#endif /* ! HAVE_SYS_SIGNAL_H */
|
|
|
45 |
+#endif /* ! HAVE_SIGNAL_H */
|
|
|
46 |
|
|
|
47 |
|
|
|
48 |
/* Calculate color temperature for the specified solar elevation. */
|
|
|
49 |
@@ -1017,7 +1017,7 @@
|
|
|
50 |
will be exactly 6500K. */
|
|
|
51 |
float adjustment_alpha = 0.0;
|
|
|
52 |
|
|
|
53 |
-#ifdef HAVE_SYS_SIGNAL_H
|
|
|
54 |
+#ifdef HAVE_SIGNAL_H
|
|
|
55 |
struct sigaction sigact;
|
|
|
56 |
sigset_t sigset;
|
|
|
57 |
sigemptyset(&sigset);
|
|
|
58 |
@@ -1034,7 +1034,7 @@
|
|
|
59 |
sigact.sa_mask = sigset;
|
|
|
60 |
sigact.sa_flags = 0;
|
|
|
61 |
sigaction(SIGUSR1, &sigact, NULL);
|
|
|
62 |
-#endif /* HAVE_SYS_SIGNAL_H */
|
|
|
63 |
+#endif /* HAVE_SIGNAL_H */
|
|
|
64 |
|
|
|
65 |
/* Continously adjust color temperature */
|
|
|
66 |
int done = 0;
|