Fix compilation with decent compilers