diff options
| author | David Robillard <d@drobilla.net> | 2024-11-23 16:35:38 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2024-11-24 18:17:29 -0500 |
| commit | 0507047424178213472cfb5750047a72b64f9542 (patch) | |
| tree | fc598d4c4c0d390f0fba41db0ff12072d171b803 | |
| parent | 0ad7658686ea1867497a276ff2d72148b57a4d1e (diff) | |
| download | sord-0507047424178213472cfb5750047a72b64f9542.tar.gz sord-0507047424178213472cfb5750047a72b64f9542.tar.bz2 sord-0507047424178213472cfb5750047a72b64f9542.zip | |
Use angle brackets for library includes and clean up include paths
| -rw-r--r-- | include/sord/sord.h | 2 | ||||
| -rw-r--r-- | include/sord/sordmm.hpp | 4 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/sord.c | 13 | ||||
| -rw-r--r-- | src/sord_internal.h | 4 | ||||
| -rw-r--r-- | src/sord_validate.c | 5 | ||||
| -rw-r--r-- | src/sordi.c | 5 | ||||
| -rw-r--r-- | src/sordmm_test.cpp | 2 | ||||
| -rw-r--r-- | src/syntax.c | 4 | ||||
| -rw-r--r-- | test/test_sord.c | 4 |
10 files changed, 23 insertions, 22 deletions
diff --git a/include/sord/sord.h b/include/sord/sord.h index 663cb81..3433e23 100644 --- a/include/sord/sord.h +++ b/include/sord/sord.h @@ -8,7 +8,7 @@ #ifndef SORD_SORD_H #define SORD_SORD_H -#include "serd/serd.h" +#include <serd/serd.h> #include <stdbool.h> #include <stddef.h> diff --git a/include/sord/sordmm.hpp b/include/sord/sordmm.hpp index 236e891..b1226d6 100644 --- a/include/sord/sordmm.hpp +++ b/include/sord/sordmm.hpp @@ -14,8 +14,8 @@ # pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" #endif -#include "serd/serd.h" -#include "sord/sord.h" +#include <serd/serd.h> +#include <sord/sord.h> #if defined(__clang__) # pragma clang diagnostic pop diff --git a/meson.build b/meson.build index 03549b7..0c7c9e6 100644 --- a/meson.build +++ b/meson.build @@ -182,7 +182,7 @@ libsord = library( darwin_versions: [major_version + '.0.0', meson.project_version()], dependencies: [m_dep, zix_dep, serd_dep], gnu_symbol_visibility: 'hidden', - include_directories: include_directories('include', 'src'), + include_directories: include_directories('include'), install: true, soversion: soversion, version: meson.project_version(), @@ -1,19 +1,18 @@ // Copyright 2011-2016 David Robillard <d@drobilla.net> // SPDX-License-Identifier: ISC -#include "sord_config.h" // IWYU pragma: keep #include "sord_internal.h" -#include "serd/serd.h" -#include "sord/sord.h" +#include <serd/serd.h> +#include <sord/sord.h> #define ZIX_HASH_KEY_TYPE SordNode #define ZIX_HASH_RECORD_TYPE SordNode #define ZIX_HASH_SEARCH_DATA_TYPE SordWorld -#include "zix/btree.h" -#include "zix/digest.h" -#include "zix/hash.h" -#include "zix/status.h" +#include <zix/btree.h> +#include <zix/digest.h> +#include <zix/hash.h> +#include <zix/status.h> #include <assert.h> #include <stdarg.h> diff --git a/src/sord_internal.h b/src/sord_internal.h index 9673677..700142a 100644 --- a/src/sord_internal.h +++ b/src/sord_internal.h @@ -4,8 +4,8 @@ #ifndef SORD_SORD_INTERNAL_H #define SORD_SORD_INTERNAL_H -#include "serd/serd.h" -#include "sord/sord.h" +#include <serd/serd.h> +#include <sord/sord.h> #include <stddef.h> diff --git a/src/sord_validate.c b/src/sord_validate.c index 0104451..50b6b2c 100644 --- a/src/sord_validate.c +++ b/src/sord_validate.c @@ -4,10 +4,11 @@ #define _BSD_SOURCE 1 // for realpath #define _DEFAULT_SOURCE 1 // for realpath -#include "serd/serd.h" -#include "sord/sord.h" #include "sord_config.h" +#include <serd/serd.h> +#include <sord/sord.h> + #if USE_PCRE2 # if defined(__clang__) # pragma clang diagnostic push diff --git a/src/sordi.c b/src/sordi.c index 659cbbf..8e15e90 100644 --- a/src/sordi.c +++ b/src/sordi.c @@ -1,10 +1,11 @@ // Copyright 2011-2016 David Robillard <d@drobilla.net> // SPDX-License-Identifier: ISC -#include "serd/serd.h" -#include "sord/sord.h" #include "sord_config.h" +#include <serd/serd.h> +#include <sord/sord.h> + #ifdef _WIN32 # include <windows.h> #endif diff --git a/src/sordmm_test.cpp b/src/sordmm_test.cpp index d7af966..7ecb6e0 100644 --- a/src/sordmm_test.cpp +++ b/src/sordmm_test.cpp @@ -1,7 +1,7 @@ // Copyright 2011 David Robillard <d@drobilla.net> // SPDX-License-Identifier: ISC -#include "sord/sordmm.hpp" +#include <sord/sordmm.hpp> int main() diff --git a/src/syntax.c b/src/syntax.c index dc80180..543c93b 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1,8 +1,8 @@ // Copyright 2011-2015 David Robillard <d@drobilla.net> // SPDX-License-Identifier: ISC -#include "serd/serd.h" -#include "sord/sord.h" +#include <serd/serd.h> +#include <sord/sord.h> #include <stdbool.h> #include <stdint.h> diff --git a/test/test_sord.c b/test/test_sord.c index df5e398..bf7ac32 100644 --- a/test/test_sord.c +++ b/test/test_sord.c @@ -1,8 +1,8 @@ // Copyright 2011-2016 David Robillard <d@drobilla.net> // SPDX-License-Identifier: ISC -#include "serd/serd.h" -#include "sord/sord.h" +#include <serd/serd.h> +#include <sord/sord.h> #include <inttypes.h> #include <stdarg.h> |