aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorjohalun <johalun0@gmail.com>2017-06-05 13:44:29 +0200
committerjohalun <johalun0@gmail.com>2017-06-06 09:45:50 +0200
commit7fef2830446e1f98a02f8d8a3bba866b7edd5bd0 (patch)
tree10c1529eb56235b303bdbca905e8b80dce47ae6d /sway
parent5ed533a94331ea2d849f900ee20f8932d742e9b5 (diff)
downloadsway-7fef2830446e1f98a02f8d8a3bba866b7edd5bd0.tar.xz
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).
Diffstat (limited to 'sway')
-rw-r--r--sway/border.c2
-rw-r--r--sway/commands.c2
-rw-r--r--sway/commands/assign.c3
-rw-r--r--sway/commands/set.c2
-rw-r--r--sway/config.c4
-rw-r--r--sway/criteria.c2
-rw-r--r--sway/input.c4
-rw-r--r--sway/main.c3
-rw-r--r--sway/security.c2
9 files changed, 11 insertions, 13 deletions
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 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
#include <wlc/wlc-render.h>
#include <cairo/cairo.h>
#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 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
#include <xkbcommon/xkbcommon.h>
#include <xkbcommon/xkbcommon-names.h>
#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 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
#include <stdio.h>
#include <string.h>
#include "sway/commands.h"
@@ -55,4 +55,3 @@ struct cmd_results *cmd_assign(int argc, char **argv) {
}
return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
-
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 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
#include <stdio.h>
#include <string.h>
#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 @@
#define _POSIX_C_SOURCE 200809L
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
#include <stdio.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -527,7 +527,7 @@ bool load_main_config(const char *file, bool is_active) {
list_add(config->config_chain, path);
config->reading = true;
-
+
// Read security configs
bool success = true;
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 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
#include <stdlib.h>
#include <stdio.h>
#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 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
#include <ctype.h>
#include <float.h>
#include <limits.h>
@@ -60,7 +60,7 @@ char *libinput_dev_unique_id(struct libinput_device *device) {
}
const char *fmt = "%d:%d:%s";
- snprintf(identifier, len, fmt, vendor, product, name);
+ snprintf(identifier, len, fmt, vendor, product, name);
free(name);
return identifier;
}
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 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
#define _POSIX_C_SOURCE 200112L
#include <stdio.h>
#include <stdlib.h>
@@ -433,4 +433,3 @@ int main(int argc, char **argv) {
return exit_value;
}
-
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 @@
-#define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 700
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>