diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2014-12-20 11:46:47 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-12-20 11:46:47 +0000 |
| commit | 3eb5209c42d45458c34e554cef6a626f0326b511 (patch) | |
| tree | dee0ead88f759c8dfce209c42b58eabd7345985f | |
| parent | dee446280575217e81fdf2787e231ba92113c403 (diff) | |
| parent | 78c9527819b6acbf4d3826383eaa328780170b48 (diff) | |
| download | libcss-3eb5209c42d45458c34e554cef6a626f0326b511.tar.gz libcss-3eb5209c42d45458c34e554cef6a626f0326b511.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/libcss
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/parse/properties/Makefile | 2 | ||||
| -rw-r--r-- | src/select/properties/column_count.c | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -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 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); } |