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 | 729fdf7d9186ceba0f84b87edfd473642964227f (diff) |
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 @@ +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <getopt.h> -#include <stdint.h> -#include <sys/un.h> #include <sys/socket.h> +#include <sys/un.h> #include <unistd.h> -#include "log.h" -#include "stringop.h" -#include "ipc.h" -#include "readline.h" #include "ipc-client.h" +#include "readline.h" +#include "log.h" static const char ipc_magic[] = {'i', '3', '-', 'i', 'p', 'c'}; 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 @@ -#include "log.h" -#include "sway.h" -#include "readline.h" +#include <errno.h> +#include <libgen.h> +#include <signal.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#include <libgen.h> -#include <fcntl.h> #include <unistd.h> -#include <signal.h> -#include <time.h> -#include <errno.h> #include <string.h> -#include <stringop.h> +#include <time.h> +#include "log.h" +#include "sway.h" +#include "readline.h" static int colored = 1; 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 @@ #include <math.h> +#include <stdint.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> +#include <string.h> +#include <wlc/wlc.h> +#include <xkbcommon/xkbcommon-names.h> +#include "log.h" #include "readline.h" #include "util.h" -#include "log.h" int wrap(int i, int max) { return ((i % max) + max) % max; |