From c36cc99da112a7013cbc749e3755e4d3d70b7d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domokos=20S=C3=A1rm=C3=A1ny?= <domokos.sarmany@ecmwf.int>
Date: Wed, 14 Dec 2022 13:41:11 +0000
Subject: [PATCH] Always use 'defined' in compound logical statements for
macros
---
maestro/i_maestro_numa.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/maestro/i_maestro_numa.h b/maestro/i_maestro_numa.h
index 2b844848..eea9361a 100644
--- a/maestro/i_maestro_numa.h
+++ b/maestro/i_maestro_numa.h
@@ -50,7 +50,7 @@
#include <numaif.h>
#endif
-#ifdef __APPLE__ && (!defined(__arm64__))
+#ifdef defined(__APPLE__) && (!defined(__arm64__))
#include <cpuid.h>
#endif
@@ -106,7 +106,7 @@ int
mstro_numa_get_cpu(void) {
#if defined(__linux) || defined(__linux__)
return sched_getcpu();
- #elif __APPLE__ && (!defined(__arm64__))
+ #elif defined(__APPLE__) && (!defined(__arm64__))
#define CPUID(INFO, LEAF, SUBLEAF) __cpuid_count(LEAF, SUBLEAF, INFO[0], INFO[1], INFO[2], INFO[3])
uint32_t CPUInfo[4];
CPUID(CPUInfo, 1, 0);
--
GitLab