More fixes for -std=c11
travis-ci.org doesn't support c11 well, so compile with c99