From 90171a9e8bdbdfb52403bb463838f64499a22005 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 27 Nov 2021 18:09:24 -0800 Subject: [PATCH] GVC_s.config_found: use a C99 bool instead of boolean --- lib/gvc/gvcint.h | 3 ++- lib/gvc/gvconfig.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h index ed48b153d..571298751 100644 --- a/lib/gvc/gvcint.h +++ b/lib/gvc/gvcint.h @@ -20,6 +20,7 @@ extern "C" { #include "gvcommon.h" #include "gvcjob.h" #include "color.h" +#include /* active plugin headers */ typedef struct gvplugin_active_layout_s { @@ -68,7 +69,7 @@ extern "C" { GVCOMMON_t common; char *config_path; - boolean config_found; + bool config_found; /* gvParseArgs */ char **input_filenames; /* null terminated array of input filenames */ diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c index 1d73b5bb5..4a3d9b3cf 100644 --- a/lib/gvc/gvconfig.c +++ b/lib/gvc/gvconfig.c @@ -563,7 +563,7 @@ void gvconfig(GVC_t * gvc, boolean rescan) /* builtins don't require LTDL */ gvconfig_plugin_install_builtins(gvc); - gvc->config_found = FALSE; + gvc->config_found = false; #ifdef ENABLE_LTDL if (gvc->common.demand_loading) { /* see if there are any new plugins */ @@ -584,7 +584,7 @@ void gvconfig(GVC_t * gvc, boolean rescan) if (rescan) { config_rescan(gvc, gvc->config_path); - gvc->config_found = TRUE; + gvc->config_found = true; gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */ return; } @@ -613,7 +613,7 @@ void gvconfig(GVC_t * gvc, boolean rescan) agerr(AGERR, "%s read error.\n", gvc->config_path); } else { - gvc->config_found = TRUE; + gvc->config_found = true; config_text[sz] = '\0'; /* make input into a null terminated string */ rc = gvconfig_plugin_install_from_config(gvc, config_text); } -- 2.40.0