You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/media-sound/aqualung/files/aqualung-1.1-var-collision....

32 lines
1.1 KiB

From e49f31ba779c938fa6dd3eaf848c68735e3386f5 Mon Sep 17 00:00:00 2001
From: Adam Sampson <ats@offog.org>
Date: Sun, 10 Jan 2021 22:32:04 +0000
Subject: [PATCH] Don't call a variable "bool".
If one of the headers happens to #include <stdbool.h>, this'll clash
with the C99 type definition.
---
src/build_store.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/build_store.c b/src/build_store.c
index 56b0eaf..ed4bfca 100644
--- a/src/build_store.c
+++ b/src/build_store.c
@@ -382,12 +382,12 @@ data_src_cell_toggled(GtkCellRendererToggle * cell, gchar * path, gpointer data)
data_src_gui_t * gui = (data_src_gui_t *)data;
if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(gui->list), &iter, path)) {
- gboolean bool;
+ gboolean value;
int type;
- gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &bool, 1, &type, -1);
+ gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &value, 1, &type, -1);
gtk_list_store_set(GTK_LIST_STORE(gui->list), &iter,
- 0, !bool && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1);
+ 0, !value && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1);
}
}