bit fields need to use ints; make the ifdefs consistent