diff options
author | johalun <johalun0@gmail.com> | 2017-06-05 13:44:29 +0200 |
---|---|---|
committer | johalun <johalun0@gmail.com> | 2017-06-06 09:45:50 +0200 |
commit | 7fef2830446e1f98a02f8d8a3bba866b7edd5bd0 (patch) | |
tree | 10c1529eb56235b303bdbca905e8b80dce47ae6d | |
parent | Revert "Drop epoll dependency" (diff) | |
download | sway-7fef2830446e1f98a02f8d8a3bba866b7edd5bd0.tar.gz sway-7fef2830446e1f98a02f8d8a3bba866b7edd5bd0.tar.zst sway-7fef2830446e1f98a02f8d8a3bba866b7edd5bd0.zip |
FreeBSD fixes
Increase _POSIX_SOURCE value where needed.
Increase _XOPEN_SOURCE value where needed.
Conditionally link to libcap (only on Linux).
Possibly some trailing whitespace fixes (automatic).
-rw-r--r-- | CMakeLists.txt | 5 | ||||
-rw-r--r-- | common/log.c | 2 | ||||
-rw-r--r-- | common/stringop.c | 2 | ||||
-rw-r--r-- | common/util.c | 2 | ||||
-rw-r--r-- | sway/border.c | 2 | ||||
-rw-r--r-- | sway/commands.c | 2 | ||||
-rw-r--r-- | sway/commands/assign.c | 3 | ||||
-rw-r--r-- | sway/commands/set.c | 2 | ||||
-rw-r--r-- | sway/config.c | 4 | ||||
-rw-r--r-- | sway/criteria.c | 2 | ||||
-rw-r--r-- | sway/input.c | 4 | ||||
-rw-r--r-- | sway/main.c | 3 | ||||
-rw-r--r-- | sway/security.c | 2 | ||||
-rw-r--r-- | swaygrab/json.c | 2 | ||||
-rw-r--r-- | swaygrab/main.c | 2 |
15 files changed, 20 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ed45830..edf486ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -66,7 +66,10 @@ find_package(GdkPixbuf) | |||
66 | find_package(PAM) | 66 | find_package(PAM) |
67 | 67 | ||
68 | find_package(LibInput REQUIRED) | 68 | find_package(LibInput REQUIRED) |
69 | find_package(Libcap REQUIRED) | 69 | |
70 | if (CMAKE_SYSTEM_NAME STREQUAL Linux) | ||
71 | find_package(Libcap REQUIRED) | ||
72 | endif (CMAKE_SYSTEM_NAME STREQUAL Linux) | ||
70 | 73 | ||
71 | if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) | 74 | if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) |
72 | find_package(EpollShim REQUIRED) | 75 | find_package(EpollShim REQUIRED) |
diff --git a/common/log.c b/common/log.c index 61937495..af1bdc3f 100644 --- a/common/log.c +++ b/common/log.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _POSIX_C_SOURCE 1 | 1 | #define _POSIX_C_SOURCE 199506L |
2 | #include <errno.h> | 2 | #include <errno.h> |
3 | #include <libgen.h> | 3 | #include <libgen.h> |
4 | #include <signal.h> | 4 | #include <signal.h> |
diff --git a/common/stringop.c b/common/stringop.c index 99e9636d..4a37543d 100644 --- a/common/stringop.c +++ b/common/stringop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <string.h> | 4 | #include <string.h> |
diff --git a/common/util.c b/common/util.c index 34bb5ec1..d6369853 100644 --- a/common/util.c +++ b/common/util.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include <sys/types.h> | 2 | #include <sys/types.h> |
3 | #include <sys/stat.h> | 3 | #include <sys/stat.h> |
4 | #include <unistd.h> | 4 | #include <unistd.h> |
diff --git a/sway/border.c b/sway/border.c index 10ad92c2..df0022ce 100644 --- a/sway/border.c +++ b/sway/border.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include <wlc/wlc-render.h> | 2 | #include <wlc/wlc-render.h> |
3 | #include <cairo/cairo.h> | 3 | #include <cairo/cairo.h> |
4 | #include <pango/pangocairo.h> | 4 | #include <pango/pangocairo.h> |
diff --git a/sway/commands.c b/sway/commands.c index 509fd1a8..34218491 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include <xkbcommon/xkbcommon.h> | 2 | #include <xkbcommon/xkbcommon.h> |
3 | #include <xkbcommon/xkbcommon-names.h> | 3 | #include <xkbcommon/xkbcommon-names.h> |
4 | #include <wlc/wlc.h> | 4 | #include <wlc/wlc.h> |
diff --git a/sway/commands/assign.c b/sway/commands/assign.c index ec262bb8..c3b03bbc 100644 --- a/sway/commands/assign.c +++ b/sway/commands/assign.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
@@ -55,4 +55,3 @@ struct cmd_results *cmd_assign(int argc, char **argv) { | |||
55 | } | 55 | } |
56 | return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL); | 56 | return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL); |
57 | } | 57 | } |
58 | |||
diff --git a/sway/commands/set.c b/sway/commands/set.c index 1d6bce04..e3d08dd3 100644 --- a/sway/commands/set.c +++ b/sway/commands/set.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include <strings.h> | 4 | #include <strings.h> |
diff --git a/sway/config.c b/sway/config.c index 19b1882f..85823953 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -1,5 +1,5 @@ | |||
1 | #define _POSIX_C_SOURCE 200809L | 1 | #define _POSIX_C_SOURCE 200809L |
2 | #define _XOPEN_SOURCE 500 | 2 | #define _XOPEN_SOURCE 700 |
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <stdbool.h> | 4 | #include <stdbool.h> |
5 | #include <stdlib.h> | 5 | #include <stdlib.h> |
@@ -527,7 +527,7 @@ bool load_main_config(const char *file, bool is_active) { | |||
527 | list_add(config->config_chain, path); | 527 | list_add(config->config_chain, path); |
528 | 528 | ||
529 | config->reading = true; | 529 | config->reading = true; |
530 | 530 | ||
531 | // Read security configs | 531 | // Read security configs |
532 | bool success = true; | 532 | bool success = true; |
533 | DIR *dir = opendir(SYSCONFDIR "/sway/security.d"); | 533 | DIR *dir = opendir(SYSCONFDIR "/sway/security.d"); |
diff --git a/sway/criteria.c b/sway/criteria.c index 1ea8311e..04683f66 100644 --- a/sway/criteria.c +++ b/sway/criteria.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <stdbool.h> | 4 | #include <stdbool.h> |
diff --git a/sway/input.c b/sway/input.c index 4f1ef760..6263f79f 100644 --- a/sway/input.c +++ b/sway/input.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include <ctype.h> | 2 | #include <ctype.h> |
3 | #include <float.h> | 3 | #include <float.h> |
4 | #include <limits.h> | 4 | #include <limits.h> |
@@ -60,7 +60,7 @@ char *libinput_dev_unique_id(struct libinput_device *device) { | |||
60 | } | 60 | } |
61 | 61 | ||
62 | const char *fmt = "%d:%d:%s"; | 62 | const char *fmt = "%d:%d:%s"; |
63 | snprintf(identifier, len, fmt, vendor, product, name); | 63 | snprintf(identifier, len, fmt, vendor, product, name); |
64 | free(name); | 64 | free(name); |
65 | return identifier; | 65 | return identifier; |
66 | } | 66 | } |
diff --git a/sway/main.c b/sway/main.c index 819788b1..82375e0b 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #define _POSIX_C_SOURCE 200112L | 2 | #define _POSIX_C_SOURCE 200112L |
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
@@ -433,4 +433,3 @@ int main(int argc, char **argv) { | |||
433 | 433 | ||
434 | return exit_value; | 434 | return exit_value; |
435 | } | 435 | } |
436 | |||
diff --git a/sway/security.c b/sway/security.c index 8eab6126..92de06c1 100644 --- a/sway/security.c +++ b/sway/security.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include <sys/types.h> | 2 | #include <sys/types.h> |
3 | #include <sys/stat.h> | 3 | #include <sys/stat.h> |
4 | #include <string.h> | 4 | #include <string.h> |
diff --git a/swaygrab/json.c b/swaygrab/json.c index 563b8ba3..80dae299 100644 --- a/swaygrab/json.c +++ b/swaygrab/json.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include <string.h> | 2 | #include <string.h> |
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <stdbool.h> | 4 | #include <stdbool.h> |
diff --git a/swaygrab/main.c b/swaygrab/main.c index f901d318..413de1fa 100644 --- a/swaygrab/main.c +++ b/swaygrab/main.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _XOPEN_SOURCE 700 |
2 | #define _POSIX_C_SOURCE 199309L | 2 | #define _POSIX_C_SOURCE 199309L |
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <stdbool.h> | 4 | #include <stdbool.h> |