two hunks had conflicts: * just use cc instead of gcc, it should be the same * HAVE_ADJTIME isn't used anymore anyway, so we can just remove it
two hunks had conflicts: * just use cc instead of gcc, it should be the same * HAVE_ADJTIME isn't used anymore anyway, so we can just remove it