fix GCC 4.9 compilation errors
Build with Linaro GCC 4.9.1 toolchain

Conflicts:
	Makefile