make formatting on .c and .h file more consistent.  combine 2 #ifdef sta...

...tements into one #if define() || define() statement