Mon Nov 8 14:26:43 EST 2010 geoff
    added the pragma and fixed the resulting warnings.
    other changes not applied.