diff options
| author |  Jan Beich <jbeich@FreeBSD.org> | 2019-01-23 18:00:14 +0000 |
|---|---|---|
| committer |  Brian Ashworth <bosrsf04@gmail.com> | 2019-01-23 21:50:06 -0500 |
| commit | ba96983bf0f10051de35bcc3def0d542d924bb9f (patch) | |
| tree | f2ce175495292521d5c499893364763be0267f88 /sway | |
| parent | Merge pull request #3504 from unraised/unraised-build-fix (diff) | |
| download | sway-ba96983bf0f10051de35bcc3def0d542d924bb9f.tar.gz sway-ba96983bf0f10051de35bcc3def0d542d924bb9f.tar.zst sway-ba96983bf0f10051de35bcc3def0d542d924bb9f.zip | |
Make json-c include respect pkg-config --cflags
json-c.pc contains `Cflags: -I${includedir}/json-c`, so `<json-c/json.h>`
won't be found unless the parent directory is searched by default.
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/commands.c | 2 | ||||
| -rw-r--r-- | sway/ipc-json.c | 2 | ||||
| -rw-r--r-- | sway/ipc-server.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sway/commands.c b/sway/commands.c index f92a5e46..dd994fa1 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #include <string.h> | 5 | #include <string.h> |
| 6 | #include <strings.h> | 6 | #include <strings.h> |
| 7 | #include <stdio.h> | 7 | #include <stdio.h> |
| 8 | #include <json-c/json.h> | 8 | #include <json.h> |
| 9 | #include "sway/commands.h" | 9 | #include "sway/commands.h" |
| 10 | #include "sway/config.h" | 10 | #include "sway/config.h" |
| 11 | #include "sway/criteria.h" | 11 | #include "sway/criteria.h" |
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index d72fc5db..778bf773 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #include <json-c/json.h> | 1 | #include <json.h> |
| 2 | #include <libevdev/libevdev.h> | 2 | #include <libevdev/libevdev.h> |
| 3 | #include <stdio.h> | 3 | #include <stdio.h> |
| 4 | #include <ctype.h> | 4 | #include <ctype.h> |
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 1dce8146..d1920cfd 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #include <assert.h> | 4 | #include <assert.h> |
| 5 | #include <errno.h> | 5 | #include <errno.h> |
| 6 | #include <fcntl.h> | 6 | #include <fcntl.h> |
| 7 | #include <json-c/json.h> | 7 | #include <json.h> |
| 8 | #include <stdbool.h> | 8 | #include <stdbool.h> |
| 9 | #include <stdint.h> | 9 | #include <stdint.h> |
| 10 | #include <stdio.h> | 10 | #include <stdio.h> |