From aef7e38a578de7ba43a2987d889a554df3be7277 Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Mon, 8 Dec 2014 16:40:55 +0000
Subject: Fix use of wrong enum value.

Coverity: 1257106 Inferred misuse of enum.
---
 src/select/properties/column_count.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/select/properties/column_count.c b/src/select/properties/column_count.c
index ecee5f3..92fdec2 100644
--- a/src/select/properties/column_count.c
+++ b/src/select/properties/column_count.c
@@ -63,7 +63,7 @@ css_error css__compose_column_count(const css_computed_style *parent,
 			type == CSS_COLUMN_COUNT_INHERIT ||
 			(child->uncommon != NULL && result != child)) {
 		if ((child->uncommon == NULL && parent->uncommon != NULL) ||
-				type == CSS_OUTLINE_COLOR_INHERIT) {
+				type == CSS_COLUMN_COUNT_INHERIT) {
 			type = get_column_count(parent, &count);
 		}
 
-- 
cgit v1.2.3


From 78c9527819b6acbf4d3826383eaa328780170b48 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Fri, 19 Dec 2014 13:31:55 +0000
Subject: Update to use correct BUILD/HOST variables due to buildsystem changes

---
 Makefile                      | 4 ++--
 src/parse/properties/Makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index dffe582..6fb7772 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations -Wnested-externs
 # BeOS/Haiku/AmigaOS4 standard library headers create warnings
-ifneq ($(BUILD),i586-pc-haiku)
-  ifneq ($(findstring amigaos,$(BUILD)),amigaos)
+ifneq ($(HOST),i586-pc-haiku)
+  ifneq ($(findstring amigaos,$(HOST)),amigaos)
     WARNFLAGS := $(WARNFLAGS) -Werror
   endif
 endif
diff --git a/src/parse/properties/Makefile b/src/parse/properties/Makefile
index 0e29d1c..6d6cff0 100644
--- a/src/parse/properties/Makefile
+++ b/src/parse/properties/Makefile
@@ -7,7 +7,7 @@ define build_gen_parser
 
 $(BUILDDIR)/gen_parser: $(DIR)css_property_parser_gen.c
 	$$(VQ)$$(ECHO) $$(ECHOFLAGS) " PREPARE: $$@"
-	$$(Q)$$(HOST_CC) -o $$@ $$^
+	$$(Q)$$(BUILD_CC) -o $$@ $$^
 
 endef
 
-- 
cgit v1.2.3