resync w/ cvs where Ross beat me to the punch on the GLASGOW_HASKELL thing

Distribution/PreProcess.hs

@@ -246,12 +246,12 @@ cppOptions bi lbi
             [opt | opt@('-':c:_) <- ccOptions bi, c `elem` "DIU"]
 
 hcDefines :: Compiler -> [String]
+hcDefines Compiler { compilerFlavor=GHC, compilerVersion=version }
+  = ["-D__GLASGOW_HASKELL__=" ++ versionInt version]
 hcDefines Compiler { compilerFlavor=NHC, compilerVersion=version }
   = ["-D__NHC__=" ++ versionInt version]
 hcDefines Compiler { compilerFlavor=Hugs }
   = ["-D__HUGS__"]
-hcDefines Compiler { compilerFlavor=GHC, compilerVersion=version }
-  = ["-D__GLASGOW_HASKELL__=" ++ versionInt version]
 hcDefines _ = []
 
 versionInt :: Version -> String