diff options
| author | Alejandro Colomar <alx@kernel.org> | 2022-12-30 00:36:50 +0100 |
|---|---|---|
| committer | Alejandro Colomar <alx@kernel.org> | 2022-12-30 00:36:50 +0100 |
| commit | 1e2f02918698564b32663f83dc6dcb2c01e695bb (patch) | |
| tree | 376a42268f06242b7acdf08406d4cfeb92464347 | |
| parent | cadfa2723eabb8e54b5aa5fd294c95c02eea3679 (diff) | |
Add dependency on libc-qual
Signed-off-by: Alejandro Colomar <alx@kernel.org>
| -rw-r--r-- | include/c/str/cpy/stp/_compiler.h | 6 | ||||
| -rw-r--r-- | include/c/str/cpy/stp/stpe/stpecpy.h | 1 | ||||
| -rw-r--r-- | include/c/str/cpy/stp/stpe/stpeprintf.h | 1 | ||||
| -rw-r--r-- | share/pkgconfig/libc-str-cpy-stp-uninstalled.pc | 2 | ||||
| -rw-r--r-- | src/c/str/cpy/stp/stpe/stpecpy.c | 2 | ||||
| -rw-r--r-- | src/c/str/cpy/stp/stpe/stpeprintf.c | 2 |
6 files changed, 5 insertions, 9 deletions
diff --git a/include/c/str/cpy/stp/_compiler.h b/include/c/str/cpy/stp/_compiler.h index 7b76f5f..197489b 100644 --- a/include/c/str/cpy/stp/_compiler.h +++ b/include/c/str/cpy/stp/_compiler.h @@ -17,12 +17,6 @@ c_unreachable(); \ } while (0) -#if defined(__clang__) -# define c_nullable _Nullable -#else -# define c_nullable -#endif - #define c_unlikely(e) __builtin_expect(!!(e), 0) #if defined(unreachable) diff --git a/include/c/str/cpy/stp/stpe/stpecpy.h b/include/c/str/cpy/stp/stpe/stpecpy.h index d6506e3..f557399 100644 --- a/include/c/str/cpy/stp/stpe/stpecpy.h +++ b/include/c/str/cpy/stp/stpe/stpecpy.h @@ -10,6 +10,7 @@ #include <stddef.h> #include <c/mem/cpy/mempcpy.h> +#include <c/qual/nullable/nullable.h> #include <c/str/cpy/stp/_compiler.h> #include <c/str/len/strlen.h> diff --git a/include/c/str/cpy/stp/stpe/stpeprintf.h b/include/c/str/cpy/stp/stpe/stpeprintf.h index 1a74dd8..218f205 100644 --- a/include/c/str/cpy/stp/stpe/stpeprintf.h +++ b/include/c/str/cpy/stp/stpe/stpeprintf.h @@ -9,6 +9,7 @@ #include <stdarg.h> #include <stdio.h> +#include <c/qual/nullable/nullable.h> #include <c/str/cpy/stp/_compiler.h> diff --git a/share/pkgconfig/libc-str-cpy-stp-uninstalled.pc b/share/pkgconfig/libc-str-cpy-stp-uninstalled.pc index 5a2e9e1..2e9431a 100644 --- a/share/pkgconfig/libc-str-cpy-stp-uninstalled.pc +++ b/share/pkgconfig/libc-str-cpy-stp-uninstalled.pc @@ -2,7 +2,7 @@ Name: libc-str-cpy-stp Description: stp string library URL: http://www.alejandro-colomar.es/src/alx/alx/libc-stp.git Version: <version> -Requires: libc-mem libc-str-len +Requires: libc-mem libc-qual libc-str-len Requires.private: prefix=/usr/local diff --git a/src/c/str/cpy/stp/stpe/stpecpy.c b/src/c/str/cpy/stp/stpe/stpecpy.c index 5dc3154..24d02e0 100644 --- a/src/c/str/cpy/stp/stpe/stpecpy.c +++ b/src/c/str/cpy/stp/stpe/stpecpy.c @@ -4,7 +4,7 @@ #include <c/str/cpy/stp/stpe/stpecpy.h> -#include <c/str/cpy/stp/_compiler.h> +#include <c/qual/nullable/nullable.h> #pragma clang assume_nonnull begin diff --git a/src/c/str/cpy/stp/stpe/stpeprintf.c b/src/c/str/cpy/stp/stpe/stpeprintf.c index 32d18f8..deedea0 100644 --- a/src/c/str/cpy/stp/stpe/stpeprintf.c +++ b/src/c/str/cpy/stp/stpe/stpeprintf.c @@ -6,7 +6,7 @@ #include <stdarg.h> -#include <c/str/cpy/stp/_compiler.h> +#include <c/qual/nullable/nullable.h> #pragma clang assume_nonnull begin |