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 /swaylock | |
| 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 'swaylock')
| -rw-r--r-- | swaylock/main.c | 3 | ||||
| -rw-r--r-- | swaylock/pam.c | 2 | ||||
| -rw-r--r-- | swaylock/password.c | 1 | ||||
| -rw-r--r-- | swaylock/render.c | 1 | ||||
| -rw-r--r-- | swaylock/shadow.c | 2 |
5 files changed, 3 insertions, 6 deletions
diff --git a/swaylock/main.c b/swaylock/main.c index 9b74b671..50f145e3 100644 --- a/swaylock/main.c +++ b/swaylock/main.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #define _XOPEN_SOURCE 700 | 1 | #define _POSIX_C_SOURCE 200809L |
| 2 | #define _POSIX_C_SOURCE 200112L | ||
| 3 | #include <assert.h> | 2 | #include <assert.h> |
| 4 | #include <ctype.h> | 3 | #include <ctype.h> |
| 5 | #include <errno.h> | 4 | #include <errno.h> |
diff --git a/swaylock/pam.c b/swaylock/pam.c index cac95a85..b90d9e87 100644 --- a/swaylock/pam.c +++ b/swaylock/pam.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #define _XOPEN_SOURCE 500 | 1 | #define _POSIX_C_SOURCE 200809L |
| 2 | #include <pwd.h> | 2 | #include <pwd.h> |
| 3 | #include <security/pam_appl.h> | 3 | #include <security/pam_appl.h> |
| 4 | #include <stdbool.h> | 4 | #include <stdbool.h> |
diff --git a/swaylock/password.c b/swaylock/password.c index 6138e1fe..db8ecaeb 100644 --- a/swaylock/password.c +++ b/swaylock/password.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #define _XOPEN_SOURCE 500 | ||
| 2 | #include <assert.h> | 1 | #include <assert.h> |
| 3 | #include <errno.h> | 2 | #include <errno.h> |
| 4 | #include <pwd.h> | 3 | #include <pwd.h> |
diff --git a/swaylock/render.c b/swaylock/render.c index fa8832bd..cbd5d01d 100644 --- a/swaylock/render.c +++ b/swaylock/render.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #define _POSIX_C_SOURCE 199506L | ||
| 2 | #include <math.h> | 1 | #include <math.h> |
| 3 | #include <stdlib.h> | 2 | #include <stdlib.h> |
| 4 | #include <wayland-client.h> | 3 | #include <wayland-client.h> |
diff --git a/swaylock/shadow.c b/swaylock/shadow.c index f928eaa3..b7b10a67 100644 --- a/swaylock/shadow.c +++ b/swaylock/shadow.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #define _XOPEN_SOURCE | 1 | #define _XOPEN_SOURCE // for crypt |
| 2 | #include <pwd.h> | 2 | #include <pwd.h> |
| 3 | #include <shadow.h> | 3 | #include <shadow.h> |
| 4 | #include <stdbool.h> | 4 | #include <stdbool.h> |