From caee6fbff7cf0a10bf568b1ed9643d15061f305c Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Wed, 16 Oct 2024 19:24:16 +0300 Subject: Revert "replaced bool completely with gboolean" This reverts commit 024d26ac0cd869826801889f1299df34676fdf57. This was re-introducing Clang warnings since gboolean is signed. I should have read the git blame before re-introducing gboolean... --- src/parser.h | 14 ++++++++------ src/qreg.c | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/parser.h b/src/parser.h index 88de830..066896f 100644 --- a/src/parser.h +++ b/src/parser.h @@ -16,6 +16,8 @@ */ #pragma once +#include + #include #include @@ -49,7 +51,7 @@ typedef struct { * a signed integer, it's ok steal one * bit for the pass_through flag. */ - gboolean pass_through : 1; + bool pass_through : 1; } teco_loop_context_t; extern GArray *teco_loop_stack; @@ -74,8 +76,8 @@ void undo__remove_index__teco_loop_stack(guint); * FIXME: Maybe use TECO_DECLARE_VTABLE_METHOD()? */ typedef const struct { - gboolean string_building : 1; - gboolean last : 1; + bool string_building : 1; + bool last : 1; /** * Called repeatedly to process chunks of input and give interactive feedback. @@ -189,7 +191,7 @@ struct teco_state_t { * This is separate of TECO_KEYMACRO_MASK_START which is set * only in the main machine's start states. */ - gboolean is_start : 1; + bool is_start : 1; /** * Key macro mask. * This is not a bitmask since it is compared with values set @@ -457,8 +459,8 @@ struct teco_machine_main_t { struct { teco_mode_t mode : 8; - gboolean modifier_colon : 1; - gboolean modifier_at : 1; + bool modifier_colon : 1; + bool modifier_at : 1; }; guint __flags; }; diff --git a/src/qreg.c b/src/qreg.c index 58c0966..c337dbe 100644 --- a/src/qreg.c +++ b/src/qreg.c @@ -18,6 +18,7 @@ #include "config.h" #endif +#include #include #include @@ -1268,7 +1269,7 @@ struct teco_machine_qregspec_t { union { struct { teco_qreg_type_t type : 8; - gboolean parse_only : 1; + bool parse_only : 1; }; guint __flags; }; -- cgit v1.2.3