From 311f8876afbbe3cbe0aa04742ef41831ffcb85bb Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 26 Dec 2010 14:16:22 -0500 Subject: [PATCH] Minor build fixes. I made these two tiny changes to SeaBIOS when I was playing with the HEAD version. The Makefile change prevents the test command from failing if CC contains a space. The coreboot change prevents a warning on our gcc 4.5.2 in certain circumstances when sizeof seems to be unsigned long int instead of unsigned int. They're both unintrusive, shouldn't have potential for breaking anything. Signed-off-by: Stefan Reinauer --- Makefile | 2 +- src/coreboot.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index acc2385..384bf79 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ vpath %.S src vgasrc ################ Build rules # Verify the gcc configuration and test if -fwhole-program works. -TESTGCC:=$(shell CC=$(CC) tools/test-gcc.sh) +TESTGCC:=$(shell CC="$(CC)" tools/test-gcc.sh) ifeq "$(TESTGCC)" "-1" $(error "Please upgrade GCC") endif diff --git a/src/coreboot.c b/src/coreboot.c index 50d300c..cdbf337 100644 --- a/src/coreboot.c +++ b/src/coreboot.c @@ -320,7 +320,7 @@ ulzma(u8 *dst, u32 maxlen, const u8 *src, u32 srclen) u8 scratch[15980]; int need = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb)); if (need > sizeof(scratch)) { - dprintf(1, "LzmaDecode need %d have %d\n", need, sizeof(scratch)); + dprintf(1, "LzmaDecode need %d have %d\n", need, (unsigned int)sizeof(scratch)); return -1; } state.Probs = (CProb *)scratch; -- 2.25.1