diff options
| author | Benny Baumann <BenBE@geshi.org> | 2021-03-20 11:21:20 +0100 |
|---|---|---|
| committer | cgzones <cgzones@googlemail.com> | 2021-03-21 21:49:04 +0100 |
| commit | 57e0ce7b4ffce8cf41bd3003831198d0bb38ebf2 (patch) | |
| tree | fb8d84bb5068ba69535ce759766ab498916894d4 | |
| parent | 1cb3aee07a5be99dff3407ff9b5de0d63b330177 (diff) | |
Use `#if defined()` syntax when `#elif defined()` is present
This prefers the `#if defined()` syntax over the `#ifdef` variant
whenever there's also a `#elif defined()` clause, thus making the
multiple branching structure more obvious and the overall use
more consistent.
| -rw-r--r-- | Affinity.c | 4 | ||||
| -rw-r--r-- | CRT.c | 2 | ||||
| -rw-r--r-- | DisplayOptionsPanel.c | 2 | ||||
| -rw-r--r-- | Macros.h | 2 | ||||
| -rw-r--r-- | linux/LinuxProcessList.c | 2 |
5 files changed, 6 insertions, 6 deletions
@@ -14,7 +14,7 @@ in the source distribution for its full text. #include "XUtils.h" -#ifdef HAVE_LIBHWLOC +#if defined(HAVE_LIBHWLOC) #include <hwloc.h> #include <hwloc/bitmap.h> #ifdef __linux__ @@ -50,7 +50,7 @@ void Affinity_add(Affinity* this, unsigned int id) { } -#ifdef HAVE_LIBHWLOC +#if defined(HAVE_LIBHWLOC) Affinity* Affinity_get(const Process* proc, ProcessList* pl) { hwloc_cpuset_t cpuset = hwloc_bitmap_alloc(); @@ -669,7 +669,7 @@ static int stderrRedirectNewFd = -1; static int stderrRedirectBackupFd = -1; static int createStderrCacheFile(void) { -#ifdef HAVE_MEMFD_CREATE +#if defined(HAVE_MEMFD_CREATE) return memfd_create("htop.stderr-redirect", 0); #elif defined(O_TMPFILE) return open("/tmp", O_TMPFILE | O_CREAT | O_EXCL | O_RDWR, S_IRUSR | S_IWUSR); diff --git a/DisplayOptionsPanel.c b/DisplayOptionsPanel.c index 884045f3..dd26989f 100644 --- a/DisplayOptionsPanel.c +++ b/DisplayOptionsPanel.c @@ -120,7 +120,7 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager* Panel_add(super, (Object*) CheckItem_newByRef("Also show CPU frequency", &(settings->showCPUFrequency))); #ifdef BUILD_WITH_CPU_TEMP Panel_add(super, (Object*) CheckItem_newByRef( - #ifdef HTOP_LINUX + #if defined(HTOP_LINUX) "Also show CPU temperature (requires libsensors)", #elif defined(HTOP_FREEBSD) "Also show CPU temperature", @@ -52,7 +52,7 @@ // ignore casts discarding const specifier, e.g. // const char [] -> char * / void * // const char *[2]' -> char *const * -#ifdef __clang__ +#if defined(__clang__) #define IGNORE_WCASTQUAL_BEGIN _Pragma("clang diagnostic push") \ _Pragma("clang diagnostic ignored \"-Wcast-qual\"") #define IGNORE_WCASTQUAL_END _Pragma("clang diagnostic pop") diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 7df17fd9..b12a415b 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -48,7 +48,7 @@ in the source distribution for its full text. #include "Settings.h" #include "XUtils.h" -#ifdef MAJOR_IN_MKDEV +#if defined(MAJOR_IN_MKDEV) #include <sys/mkdev.h> #elif defined(MAJOR_IN_SYSMACROS) #include <sys/sysmacros.h> |