logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0006-Avoid-conflict-with-C23-bool-keyword.patch (809B)


  1. From 2f6ff5f479fc24f2c4cf7e3a30470a3aadb55607 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sat, 21 Jan 2023 17:18:50 -0800
  4. Subject: [PATCH] Avoid conflict with C23 bool keyword
  5. ---
  6. cmd/zed/agents/fmd_api.h | 2 +-
  7. 1 file changed, 1 insertion(+), 1 deletion(-)
  8. diff --git a/cmd/zed/agents/fmd_api.h b/cmd/zed/agents/fmd_api.h
  9. index b940d0d39..7c485a9c9 100644
  10. --- a/cmd/zed/agents/fmd_api.h
  11. +++ b/cmd/zed/agents/fmd_api.h
  12. @@ -105,7 +105,7 @@ typedef struct fmd_stat {
  13. uint_t fmds_type; /* statistic type (see above) */
  14. char fmds_desc[64]; /* statistic description */
  15. union {
  16. - int bool; /* FMD_TYPE_BOOL */
  17. + int b; /* FMD_TYPE_BOOL */
  18. int32_t i32; /* FMD_TYPE_INT32 */
  19. uint32_t ui32; /* FMD_TYPE_UINT32 */
  20. int64_t i64; /* FMD_TYPE_INT64 */
  21. --
  22. 2.37.3