Compile of master broken with --enable-gcc-warnings

Fix is in my branch osx_compile in my repo.