Only one minor conflict found.
---
software/include.mak | 2 +-
software/libbase/vsnprintf.c | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/software/include.mak b/software/include.mak
index 04608c5..b0a774a 100644
--- a/software/include.mak
+++ b/software/include.mak
@@ -38,7 +38,7 @@ INCLUDES_NOLIBC ?= -nostdinc -I$(MMDIR)/software/include/base
INCLUDES = $(INCLUDES_NOLIBC) -I$(MMDIR)/software/include -I$(MMDIR)/tools
ASFLAGS = $(INCLUDES) -nostdinc
# later: -Wmissing-prototypes
-CFLAGS = -O9 -Wall -Wstrict-prototypes -Wold-style-definition \
+CFLAGS = -O9 -Wall -Wstrict-prototypes -Wold-style-definition -Wshadow \
-mbarrel-shift-enabled -mmultiply-enabled -mdivide-enabled \
-msign-extend-enabled -fno-builtin -fsigned-char \
-fsingle-precision-constant $(INCLUDES)
diff --git a/software/libbase/vsnprintf.c b/software/libbase/vsnprintf.c
index d659f21..102ee8c 100644
--- a/software/libbase/vsnprintf.c
+++ b/software/libbase/vsnprintf.c
@@ -198,7 +198,6 @@ int vsnprintf(char *buf, size_t size, const char *fmt,
va_list args)
int m;
float f;
int integer;
- int i;
/* until I sort out how to disable this stupid
promotion to double ... */
f = *(va_arg(args, float *));
--
1.7.1
_______________________________________________
http://lists.milkymist.org/listinfo.cgi/devel-milkymist.org
IRC: #milkymist@Freenode
