Merge pull request #771 from geesun/C99

For C99 compliance, changed the unsigned char/short bitfield to unsigned int bitfields