Moved some #ifdefs around that got put in the wrong place by the

latest OS/2 patch set.