diff options
author | emersion <contact@emersion.fr> | 2018-11-25 12:12:48 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-11-25 17:19:43 +0100 |
commit | 3a310f92ab619cf8afcb99486bc91b49c7989791 (patch) | |
tree | d9512652cc8891246ab9faf77e9c9e329f82f818 /swaynag | |
parent | Merge pull request #3179 from baloo/baloo/title_format-pango_markup (diff) | |
download | sway-3a310f92ab619cf8afcb99486bc91b49c7989791.tar.gz sway-3a310f92ab619cf8afcb99486bc91b49c7989791.tar.zst sway-3a310f92ab619cf8afcb99486bc91b49c7989791.zip |
Replace _XOPEN_SOURCE with _POSIX_C_SOURCE
And make sure we don't define both in the same source file.
Diffstat (limited to 'swaynag')
-rw-r--r-- | swaynag/config.c | 4 | ||||
-rw-r--r-- | swaynag/main.c | 3 | ||||
-rw-r--r-- | swaynag/swaynag.c | 2 | ||||
-rw-r--r-- | swaynag/types.c | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/swaynag/config.c b/swaynag/config.c index cd34dcc2..63808ce4 100644 --- a/swaynag/config.c +++ b/swaynag/config.c | |||
@@ -1,5 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 700 | 1 | #define _POSIX_C_SOURCE 200809L |
2 | #define _POSIX_C_SOURCE 200112L | ||
3 | #include <getopt.h> | 2 | #include <getopt.h> |
4 | #include <stdlib.h> | 3 | #include <stdlib.h> |
5 | #include <wordexp.h> | 4 | #include <wordexp.h> |
@@ -398,4 +397,3 @@ int swaynag_load_config(char *path, struct swaynag *swaynag, list_t *types) { | |||
398 | fclose(config); | 397 | fclose(config); |
399 | return 0; | 398 | return 0; |
400 | } | 399 | } |
401 | |||
diff --git a/swaynag/main.c b/swaynag/main.c index bae3c0e2..9f00ac7e 100644 --- a/swaynag/main.c +++ b/swaynag/main.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _POSIX_C_SOURCE 200809L |
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | #include <signal.h> | 3 | #include <signal.h> |
4 | #include "log.h" | 4 | #include "log.h" |
@@ -130,4 +130,3 @@ cleanup: | |||
130 | swaynag_destroy(&swaynag); | 130 | swaynag_destroy(&swaynag); |
131 | return exit_code; | 131 | return exit_code; |
132 | } | 132 | } |
133 | |||
diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c index 06185f20..74e127b6 100644 --- a/swaynag/swaynag.c +++ b/swaynag/swaynag.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _POSIX_C_SOURCE 200809L |
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | #include <assert.h> | 3 | #include <assert.h> |
4 | #include <sys/stat.h> | 4 | #include <sys/stat.h> |
diff --git a/swaynag/types.c b/swaynag/types.c index 1e0a138b..129644b7 100644 --- a/swaynag/types.c +++ b/swaynag/types.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define _XOPEN_SOURCE 500 | 1 | #define _POSIX_C_SOURCE 200809L |
2 | #include <getopt.h> | 2 | #include <getopt.h> |
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |