get rid off C99 and GNU extensions