Get rid of gnuc99-ism