Replace _XOPEN_SOURCE with _POSIX_C_SOURCE

And make sure we don't define both in the same source file.

common/stringop.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

sway/commands/assign.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <string.h>
 #include "sway/commands.h"

sway/commands/bar/bindsym.c

@@ -1,4 +1,3 @@
-#define _XOPEN_SOURCE 500
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>

sway/commands/bar/hidden_state.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"

sway/commands/bar/icon_theme.c

@@ -1,4 +1,3 @@
-#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 

sway/commands/bar/id.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"

sway/commands/bar/mode.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"

sway/commands/bar/output.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
 #include "sway/commands.h"

sway/commands/bar/separator_symbol.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"

sway/commands/bar/tray_output.c

@@ -1,4 +1,3 @@
-#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 

sway/commands/bind.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #ifdef __linux__
 #include <linux/input-event-codes.h>
 #elif __FreeBSD__

sway/commands/exec_always.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>

sway/commands/for_window.c

@@ -1,4 +1,3 @@
-#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/criteria.h"

sway/commands/input/xkb_layout.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"

sway/commands/input/xkb_model.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"

sway/commands/input/xkb_options.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"

sway/commands/input/xkb_rules.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"

sway/commands/input/xkb_variant.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"

sway/commands/mode.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <string.h>
 #include <strings.h>

sway/commands/move.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <stdbool.h>
 #include <string.h>

sway/commands/no_focus.c

@@ -1,4 +1,3 @@
-#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/criteria.h"

sway/commands/reload.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/config.h"

sway/commands/rename.c

@@ -1,4 +1,3 @@
-#define _XOPEN_SOURCE 500
 #include <ctype.h>
 #include <string.h>
 #include <strings.h>

sway/commands/seat/attach.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <strings.h>
 #include "sway/input/input-manager.h"

sway/commands/seat/cursor.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #ifdef __linux__
 #include <linux/input-event-codes.h>
 #elif __FreeBSD__

sway/commands/set.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>

sway/commands/workspace.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>
@@ -38,7 +38,7 @@ void free_workspace_config(struct workspace_config *wsc) {
 }
 
 static void prevent_invalid_outer_gaps(struct workspace_config *wsc) {
-	if (wsc->gaps_outer.top != INT_MIN && 
+	if (wsc->gaps_outer.top != INT_MIN &&
 			wsc->gaps_outer.top < -wsc->gaps_inner) {
 		wsc->gaps_outer.top = -wsc->gaps_inner;
 	}

sway/config.c

@@ -1,5 +1,4 @@
-#define _POSIX_C_SOURCE 200809L
-#define _XOPEN_SOURCE 700
+#define _XOPEN_SOURCE 600 // for realpath
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>

sway/config/bar.c

@@ -1,5 +1,4 @@
 #define _POSIX_C_SOURCE 200809L
-#define _XOPEN_SOURCE 700
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>

sway/config/input.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <limits.h>
 #include <float.h>

sway/config/output.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <stdbool.h>
 #include <string.h>

sway/config/seat.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
 #include "sway/config.h"

sway/criteria.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>

sway/input/cursor.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <math.h>
 #ifdef __linux__
 #include <linux/input-event-codes.h>

sway/input/input-manager.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <ctype.h>
 #include <float.h>
 #include <limits.h>

sway/input/seat.c

@@ -1,5 +1,4 @@
-#define _XOPEN_SOURCE 700
-#define _POSIX_C_SOURCE 199309L
+#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <errno.h>
 #ifdef __linux__

sway/main.c

@@ -1,5 +1,4 @@
-#define _XOPEN_SOURCE 700
-#define _POSIX_C_SOURCE 200112L
+#define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
 #include <pango/pangocairo.h>
 #include <signal.h>

sway/security.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 700
+#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
 #include "sway/security.h"

swaybar/bar.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>

swaybar/config.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
 #include <wlr/util/log.h>

swaybar/main.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

swaylock/main.c

@@ -1,5 +1,4 @@
-#define _XOPEN_SOURCE 700
-#define _POSIX_C_SOURCE 200112L
+#define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>

swaylock/pam.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <pwd.h>
 #include <security/pam_appl.h>
 #include <stdbool.h>

swaylock/password.c

@@ -1,4 +1,3 @@
-#define _XOPEN_SOURCE 500
 #include <assert.h>
 #include <errno.h>
 #include <pwd.h>

swaylock/render.c

@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 199506L
 #include <math.h>
 #include <stdlib.h>
 #include <wayland-client.h>

swaylock/shadow.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE // for crypt
 #include <pwd.h>
 #include <shadow.h>
 #include <stdbool.h>

swaymsg/main.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

swaynag/config.c

@@ -1,5 +1,4 @@
-#define _XOPEN_SOURCE 700
-#define _POSIX_C_SOURCE 200112L
+#define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
 #include <stdlib.h>
 #include <wordexp.h>
@@ -398,4 +397,3 @@ int swaynag_load_config(char *path, struct swaynag *swaynag, list_t *types) {
 	fclose(config);
 	return 0;
 }
-

swaynag/main.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <signal.h>
 #include "log.h"
@@ -130,4 +130,3 @@ cleanup:
 	swaynag_destroy(&swaynag);
 	return exit_code;
 }
-

swaynag/swaynag.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <assert.h>
 #include <sys/stat.h>

swaynag/types.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
 #include <stdbool.h>
 #include <stdlib.h>