patch applied (cabal-branches/cabal-1.4): fix scope errors in non-GHC branch of an #ifdef