[commit: ghc] master: Prefer #if defined to #ifdef (945c45a)

git at git.haskell.org git at git.haskell.org
Sat Apr 29 02:35:26 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/945c45ad50ed31e3acb96fdaafb21640c4669f12/ghc

>---------------------------------------------------------------

commit 945c45ad50ed31e3acb96fdaafb21640c4669f12
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Apr 21 09:16:48 2017 -0400

    Prefer #if defined to #ifdef
    
    Our new CPP linter enforces this.


>---------------------------------------------------------------

945c45ad50ed31e3acb96fdaafb21640c4669f12
 compiler/basicTypes/RdrName.hs                 |   2 +-
 compiler/cmm/MkGraph.hs                        |   2 +-
 compiler/coreSyn/CoreArity.hs                  |   2 +-
 compiler/deSugar/Desugar.hs                    |   2 +-
 compiler/ghci/GHCi.hsc                         |  14 +-
 compiler/iface/MkIface.hs                      |   2 +-
 compiler/llvmGen/Llvm/Types.hs                 |   2 +-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs        |   2 +-
 compiler/main/DynFlags.hs                      |   6 +-
 compiler/main/DynamicLoading.hs                |   6 +-
 compiler/main/SysTools.hs                      |   6 +-
 compiler/parser/cutils.c                       |   2 +-
 compiler/prelude/primops.txt.pp                |   2 +-
 compiler/simplCore/SimplCore.hs                |   6 +-
 compiler/specialise/Rules.hs                   |   2 +-
 compiler/typecheck/TcMType.hs                  |   2 +-
 compiler/typecheck/TcPluginM.hs                |   4 +-
 compiler/typecheck/TcRnDriver.hs               |   4 +-
 compiler/typecheck/TcSMonad.hs                 |   8 +-
 compiler/utils/Panic.hs                        |   2 +-
 compiler/utils/Util.hs                         |  20 +-
 driver/gcc/gcc.c                               |   2 +-
 ghc/GHCi/UI.hs                                 |   8 +-
 ghc/Main.hs                                    |  12 +-
 ghc/hschooks.c                                 |   2 +-
 includes/Cmm.h                                 |  18 +-
 includes/CodeGen.Platform.hs                   | 410 ++++++++++++-------------
 includes/HsFFI.h                               |   4 +-
 includes/MachDeps.h                            |   4 +-
 includes/Rts.h                                 |  30 +-
 includes/RtsAPI.h                              |   6 +-
 includes/Stg.h                                 |   6 +-
 includes/rts/EventLogFormat.h                  |   2 +-
 includes/rts/Flags.h                           |   2 +-
 includes/rts/OSThreads.h                       |  14 +-
 includes/rts/Threads.h                         |   2 +-
 includes/rts/prof/LDV.h                        |   4 +-
 includes/rts/storage/Block.h                   |  12 +-
 includes/rts/storage/ClosureMacros.h           |   8 +-
 includes/rts/storage/Closures.h                |   4 +-
 includes/rts/storage/InfoTables.h              |  24 +-
 includes/rts/storage/MBlock.h                  |   2 +-
 includes/rts/storage/TSO.h                     |   6 +-
 includes/stg/DLL.h                             |   4 +-
 includes/stg/HaskellMachRegs.h                 |  14 +-
 includes/stg/MachRegs.h                        |  18 +-
 includes/stg/MiscClosures.h                    |   6 +-
 includes/stg/RtsMachRegs.h                     |  18 +-
 includes/stg/Ticky.h                           |   4 +-
 libraries/base/Control/Concurrent.hs           |  12 +-
 libraries/base/Data/Bits.hs                    |   2 +-
 libraries/base/Data/OldList.hs                 |  10 +-
 libraries/base/Data/Semigroup.hs               |   4 +-
 libraries/base/Foreign/C/String.hs             |   2 +-
 libraries/base/GHC/Conc.hs                     |   8 +-
 libraries/base/GHC/Conc/IO.hs                  |  22 +-
 libraries/base/GHC/Conc/Windows.hs             |   2 +-
 libraries/base/GHC/Environment.hs              |   4 +-
 libraries/base/GHC/Event/KQueue.hsc            |   4 +-
 libraries/base/GHC/Event/Poll.hsc              |   2 +-
 libraries/base/GHC/IO/Buffer.hs                |  12 +-
 libraries/base/GHC/IO/Encoding/CodePage.hs     |   2 +-
 libraries/base/GHC/IO/Encoding/CodePage/API.hs |  10 +-
 libraries/base/GHC/IO/Encoding/Iconv.hs        |   2 +-
 libraries/base/GHC/IO/FD.hs                    |  30 +-
 libraries/base/GHC/IO/Handle.hs                |   2 +-
 libraries/base/GHC/IO/Handle/FD.hs             |   6 +-
 libraries/base/GHC/IO/Handle/Text.hs           |   2 +-
 libraries/base/GHC/IO/Handle/Types.hs          |   6 +-
 libraries/base/GHC/List.hs                     |  28 +-
 libraries/base/GHC/Real.hs                     |   4 +-
 libraries/base/GHC/TopHandler.hs               |   6 +-
 libraries/base/System/Environment.hs           |  28 +-
 libraries/base/System/IO.hs                    |   8 +-
 libraries/base/System/Posix/Internals.hs       |   6 +-
 libraries/base/System/Timeout.hs               |   4 +-
 libraries/base/cbits/SetEnv.c                  |   4 +-
 libraries/base/cbits/iconv.c                   |   2 +-
 libraries/base/cbits/primFloat.c               |   2 +-
 libraries/base/include/HsBase.h                |  54 ++--
 libraries/base/include/ieee-flpt.h             |  14 +-
 libraries/ghci/GHCi/ObjLink.hs                 |   4 +-
 libraries/ghci/GHCi/Signals.hs                 |   2 +-
 rts/Adjustor.c                                 |   6 +-
 rts/AdjustorAsm.S                              |   4 +-
 rts/Apply.cmm                                  |   8 +-
 rts/Apply.h                                    |   4 +-
 rts/AutoApply.h                                |   2 +-
 rts/Capability.c                               |  10 +-
 rts/Capability.h                               |   4 +-
 rts/CheckUnload.c                              |   4 +-
 rts/Compact.cmm                                |   4 +-
 rts/Disassembler.c                             |   2 +-
 rts/Disassembler.h                             |   2 +-
 rts/FileLock.c                                 |   6 +-
 rts/Globals.c                                  |  10 +-
 rts/HeapStackCheck.cmm                         |  10 +-
 rts/Hpc.c                                      |   8 +-
 rts/Interpreter.c                              |  62 ++--
 rts/LdvProfile.c                               |   2 +-
 rts/LdvProfile.h                               |   2 +-
 rts/Libdw.c                                    |   2 +-
 rts/Linker.c                                   |  20 +-
 rts/Messages.c                                 |  10 +-
 rts/Messages.h                                 |   2 +-
 rts/Pool.c                                     |  12 +-
 rts/Prelude.h                                  |   2 +-
 rts/PrimOps.cmm                                |  34 +-
 rts/Printer.c                                  |  14 +-
 rts/Printer.h                                  |   2 +-
 rts/ProfHeap.c                                 |  64 ++--
 rts/ProfHeap.h                                 |   2 +-
 rts/ProfilerReport.c                           |   2 +-
 rts/ProfilerReport.h                           |   2 +-
 rts/ProfilerReportJson.c                       |   2 +-
 rts/ProfilerReportJson.h                       |   2 +-
 rts/Profiling.c                                |  16 +-
 rts/Profiling.h                                |   6 +-
 rts/Proftimer.c                                |   8 +-
 rts/RaiseAsync.c                               |   8 +-
 rts/RaiseAsync.h                               |   2 +-
 rts/RetainerProfile.c                          |  82 ++---
 rts/RetainerProfile.h                          |   4 +-
 rts/RetainerSet.c                              |  14 +-
 rts/RetainerSet.h                              |  14 +-
 rts/RtsAPI.c                                   |   2 +-
 rts/RtsDllMain.c                               |   2 +-
 rts/RtsDllMain.h                               |   2 +-
 rts/RtsFlags.c                                 |  48 +--
 rts/RtsMain.c                                  |   4 +-
 rts/RtsMessages.c                              |   4 +-
 rts/RtsProbes.d                                |   2 +-
 rts/RtsStartup.c                               |  18 +-
 rts/RtsSymbols.c                               |   4 +-
 rts/RtsSymbols.h                               |   2 +-
 rts/RtsUtils.c                                 |  16 +-
 rts/RtsUtils.h                                 |   2 +-
 rts/SMPClosureOps.h                            |   2 +-
 rts/STM.c                                      |   2 +-
 rts/STM.h                                      |   2 +-
 rts/Schedule.c                                 |  62 ++--
 rts/Stable.c                                   |   6 +-
 rts/Stable.h                                   |   2 +-
 rts/StaticPtrTable.c                           |   6 +-
 rts/Stats.c                                    |  26 +-
 rts/Stats.h                                    |   4 +-
 rts/StgCRun.c                                  |  24 +-
 rts/StgStartup.cmm                             |   2 +-
 rts/StgStdThunks.cmm                           |   4 +-
 rts/Task.c                                     |   8 +-
 rts/ThreadPaused.c                             |   4 +-
 rts/Threads.c                                  |   6 +-
 rts/Threads.h                                  |   4 +-
 rts/Timer.c                                    |   4 +-
 rts/TopHandler.c                               |   6 +-
 rts/Trace.c                                    |  66 ++--
 rts/Trace.h                                    |  12 +-
 rts/Updates.h                                  |   6 +-
 rts/Weak.c                                     |   2 +-
 rts/eventlog/EventLog.c                        |  14 +-
 rts/eventlog/EventLog.h                        |   4 +-
 rts/eventlog/EventLogWriter.c                  |   6 +-
 rts/linker/LoadArchive.c                       |   2 +-
 rts/linker/M32Alloc.h                          |   2 +-
 rts/linker/MachO.c                             |  22 +-
 rts/linker/MachO.h                             |   2 +-
 rts/linker/PEi386.c                            |   6 +-
 rts/linker/PEi386.h                            |   2 +-
 rts/linker/SymbolExtras.c                      |   8 +-
 rts/linker/SymbolExtras.h                      |   2 +-
 rts/package.conf.in                            |  20 +-
 rts/posix/Clock.h                              |  10 +-
 rts/posix/GetTime.c                            |   4 +-
 rts/posix/OSMem.c                              |  26 +-
 rts/posix/OSThreads.c                          |   8 +-
 rts/posix/Signals.c                            |  22 +-
 rts/posix/Signals.h                            |   2 +-
 rts/posix/TTY.c                                |   4 +-
 rts/posix/itimer/Pthread.c                     |  12 +-
 rts/posix/itimer/Setitimer.c                   |   6 +-
 rts/posix/itimer/TimerCreate.c                 |   2 +-
 rts/sm/BlockAlloc.c                            |   2 +-
 rts/sm/BlockAlloc.h                            |   2 +-
 rts/sm/CNF.c                                   |  16 +-
 rts/sm/CNF.h                                   |   2 +-
 rts/sm/Compact.c                               |   2 +-
 rts/sm/Evac.c                                  |  16 +-
 rts/sm/Evac_thr.c                              |   2 +-
 rts/sm/GC.c                                    |  28 +-
 rts/sm/GC.h                                    |   2 +-
 rts/sm/GCThread.h                              |   2 +-
 rts/sm/GCUtils.c                               |   6 +-
 rts/sm/GCUtils.h                               |   2 +-
 rts/sm/HeapAlloc.h                             |   2 +-
 rts/sm/MBlock.c                                |  10 +-
 rts/sm/MarkWeak.c                              |   4 +-
 rts/sm/OSMem.h                                 |   2 +-
 rts/sm/Sanity.c                                |   6 +-
 rts/sm/Sanity.h                                |   2 +-
 rts/sm/Scav.c                                  |   6 +-
 rts/sm/Scav.h                                  |   2 +-
 rts/sm/Scav_thr.c                              |   2 +-
 rts/sm/ShouldCompact.h                         |   2 +-
 rts/sm/Storage.c                               |  16 +-
 rts/win32/AsyncIO.c                            |   2 +-
 rts/win32/ConsoleHandler.c                     |   2 +-
 rts/win32/GetTime.c                            |   2 +-
 rts/win32/OSMem.c                              |   2 +-
 rts/win32/OSThreads.c                          |   6 +-
 rts/win32/ThrIOManager.c                       |   2 +-
 rts/win32/veh_excn.c                           |   2 +-
 utils/genapply/Main.hs                         |   4 +-
 utils/ghc-pkg/Main.hs                          |  10 +-
 utils/hp2ps/HpFile.c                           |   2 +-
 utils/hp2ps/Main.c                             |   2 +-
 utils/hp2ps/Main.h                             |   6 +-
 utils/lndir/lndir-Xos.h                        |  30 +-
 utils/lndir/lndir-Xosdefs.h                    |  32 +-
 utils/lndir/lndir.c                            |  40 +--
 utils/unlit/unlit.c                            |   6 +-
 220 files changed, 1184 insertions(+), 1184 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 945c45ad50ed31e3acb96fdaafb21640c4669f12


More information about the ghc-commits mailing list