revert to gcc 4.2.1 compatible types