more ifdef's.  Stupid like a fox!