diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-09-01 08:18:37 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2016-09-01 08:18:37 -0400 |
commit | 416417a54c5875abcdc257b6ad10ff086c35eefc (patch) | |
tree | 00f20884a05d05e620a4a24bba8595557cd41405 /common | |
parent | Merge pull request #876 from zandrmartin/patch-1 (diff) | |
download | sway-416417a54c5875abcdc257b6ad10ff086c35eefc.tar.gz sway-416417a54c5875abcdc257b6ad10ff086c35eefc.tar.zst sway-416417a54c5875abcdc257b6ad10ff086c35eefc.zip |
Reorganize includes
Diffstat (limited to 'common')
-rw-r--r-- | common/ipc-client.c | 11 | ||||
-rw-r--r-- | common/log.c | 16 | ||||
-rw-r--r-- | common/util.c | 7 |
3 files changed, 16 insertions, 18 deletions
diff --git a/common/ipc-client.c b/common/ipc-client.c index e155c168..106f9d86 100644 --- a/common/ipc-client.c +++ b/common/ipc-client.c | |||
@@ -1,16 +1,13 @@ | |||
1 | #include <stdint.h> | ||
1 | #include <stdio.h> | 2 | #include <stdio.h> |
2 | #include <stdlib.h> | 3 | #include <stdlib.h> |
3 | #include <string.h> | 4 | #include <string.h> |
4 | #include <getopt.h> | ||
5 | #include <stdint.h> | ||
6 | #include <sys/un.h> | ||
7 | #include <sys/socket.h> | 5 | #include <sys/socket.h> |
6 | #include <sys/un.h> | ||
8 | #include <unistd.h> | 7 | #include <unistd.h> |
9 | #include "log.h" | ||
10 | #include "stringop.h" | ||
11 | #include "ipc.h" | ||
12 | #include "readline.h" | ||
13 | #include "ipc-client.h" | 8 | #include "ipc-client.h" |
9 | #include "readline.h" | ||
10 | #include "log.h" | ||
14 | 11 | ||
15 | static const char ipc_magic[] = {'i', '3', '-', 'i', 'p', 'c'}; | 12 | static const char ipc_magic[] = {'i', '3', '-', 'i', 'p', 'c'}; |
16 | static const size_t ipc_header_size = sizeof(ipc_magic)+8; | 13 | static const size_t ipc_header_size = sizeof(ipc_magic)+8; |
diff --git a/common/log.c b/common/log.c index 1da2ba2f..4f0baa3f 100644 --- a/common/log.c +++ b/common/log.c | |||
@@ -1,17 +1,15 @@ | |||
1 | #include "log.h" | 1 | #include <errno.h> |
2 | #include "sway.h" | 2 | #include <libgen.h> |
3 | #include "readline.h" | 3 | #include <signal.h> |
4 | #include <stdarg.h> | 4 | #include <stdarg.h> |
5 | #include <stdio.h> | 5 | #include <stdio.h> |
6 | #include <stdlib.h> | 6 | #include <stdlib.h> |
7 | #include <libgen.h> | ||
8 | #include <fcntl.h> | ||
9 | #include <unistd.h> | 7 | #include <unistd.h> |
10 | #include <signal.h> | ||
11 | #include <time.h> | ||
12 | #include <errno.h> | ||
13 | #include <string.h> | 8 | #include <string.h> |
14 | #include <stringop.h> | 9 | #include <time.h> |
10 | #include "log.h" | ||
11 | #include "sway.h" | ||
12 | #include "readline.h" | ||
15 | 13 | ||
16 | static int colored = 1; | 14 | static int colored = 1; |
17 | static log_importance_t loglevel_default = L_ERROR; | 15 | static log_importance_t loglevel_default = L_ERROR; |
diff --git a/common/util.c b/common/util.c index f0b0fdf0..f2302676 100644 --- a/common/util.c +++ b/common/util.c | |||
@@ -1,10 +1,13 @@ | |||
1 | #include <math.h> | 1 | #include <math.h> |
2 | #include <stdint.h> | ||
2 | #include <stdio.h> | 3 | #include <stdio.h> |
3 | #include <string.h> | ||
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
5 | #include <string.h> | ||
6 | #include <wlc/wlc.h> | ||
7 | #include <xkbcommon/xkbcommon-names.h> | ||
8 | #include "log.h" | ||
5 | #include "readline.h" | 9 | #include "readline.h" |
6 | #include "util.h" | 10 | #include "util.h" |
7 | #include "log.h" | ||
8 | 11 | ||
9 | int wrap(int i, int max) { | 12 | int wrap(int i, int max) { |
10 | return ((i % max) + max) % max; | 13 | return ((i % max) + max) % max; |