Prefer #if defined to #ifdef

Our new CPP linter enforces this.

3 files changed, 11 insertions, 11 deletions

diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs
index ab6c2dc199..52a809ea3d 100644
--- a/ghc/GHCi/UI.hs
+++ b/ghc/GHCi/UI.hs
@@ -122,7 +122,7 @@ import Text.Read.Lex (isSymbolChar)
 
 import Unsafe.Coerce
 
-#ifndef mingw32_HOST_OS
+#if !defined(mingw32_HOST_OS)
 import System.Posix hiding ( getEnv )
 #else
 import qualified System.Win32
@@ -379,7 +379,7 @@ findEditor :: IO String
 findEditor = do
   getEnv "EDITOR"
     `catchIO` \_ -> do
-#ifdef mingw32_HOST_OS
+#if defined(mingw32_HOST_OS)
         win <- System.Win32.getWindowsDirectory
         return (win </> "notepad.exe")
 #else
@@ -669,7 +669,7 @@ checkFileAndDirPerms file = do
     d -> d
 
 checkPerms :: FilePath -> IO Bool
-#ifdef mingw32_HOST_OS
+#if defined(mingw32_HOST_OS)
 checkPerms _ = return True
 #else
 checkPerms file =
@@ -720,7 +720,7 @@ formatCurrentTime format =
 
 getUserName :: IO String
 getUserName = do
-#ifdef mingw32_HOST_OS
+#if defined(mingw32_HOST_OS)
   getEnv "USERNAME"
     `catchIO` \e -> do
       putStrLn $ show e
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 29012f6f60..6ece4302db 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -25,12 +25,12 @@ import HscMain          ( newHscEnv )
 import DriverPipeline   ( oneShot, compileFile )
 import DriverMkDepend   ( doMkDependHS )
 import DriverBkp   ( doBackpack )
-#ifdef GHCI
+#if defined(GHCI)
 import GHCi.UI          ( interactiveUI, ghciWelcomeMsg, defaultGhciSettings )
 #endif
 
 -- Frontend plugins
-#ifdef GHCI
+#if defined(GHCI)
 import DynamicLoading   ( loadFrontendPlugin )
 import Plugins
 #else
@@ -258,7 +258,7 @@ main' postLoadMode dflags0 args flagWarnings = do
   liftIO $ dumpFinalStats dflags6
 
 ghciUI :: [(FilePath, Maybe Phase)] -> Maybe [String] -> Ghc ()
-#ifndef GHCI
+#if !defined(GHCI)
 ghciUI _ _ = throwGhcException (CmdLineError "not built for interactive use")
 #else
 ghciUI     = interactiveUI defaultGhciSettings
@@ -504,7 +504,7 @@ isDoEvalMode :: Mode -> Bool
 isDoEvalMode (Right (Right (DoEval _))) = True
 isDoEvalMode _ = False
 
-#ifdef GHCI
+#if defined(GHCI)
 isInteractiveMode :: PostLoadMode -> Bool
 isInteractiveMode DoInteractive = True
 isInteractiveMode _             = False
@@ -735,7 +735,7 @@ showBanner :: PostLoadMode -> DynFlags -> IO ()
 showBanner _postLoadMode dflags = do
    let verb = verbosity dflags
 
-#ifdef GHCI
+#if defined(GHCI)
    -- Show the GHCi banner
    when (isInteractiveMode _postLoadMode && verb >= 1) $ putStrLn ghciWelcomeMsg
 #endif
@@ -831,7 +831,7 @@ dumpPackagesSimple dflags = putMsg dflags (pprPackagesSimple dflags)
 -- Frontend plugin support
 
 doFrontend :: ModuleName -> [(String, Maybe Phase)] -> Ghc ()
-#ifndef GHCI
+#if !defined(GHCI)
 doFrontend modname _ = pluginError [modname]
 #else
 doFrontend modname srcs = do
diff --git a/ghc/hschooks.c b/ghc/hschooks.c
index ace28be64c..031cb02d1a 100644
--- a/ghc/hschooks.c
+++ b/ghc/hschooks.c
@@ -18,7 +18,7 @@ in instead of the defaults.
 #include <string.h>
 #include <stdbool.h>
 
-#ifdef HAVE_UNISTD_H
+#if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif