Converting for the new version of gcc.