New upstream version 3.0.3upstream/3.0.3

1 files changed, 17 insertions, 3 deletions

diff --git a/Affinity.h b/Affinity.h
index 20d0047..97c8e46 100644
--- a/Affinity.h
+++ b/Affinity.h
@@ -4,13 +4,27 @@
 htop - Affinity.h
 (C) 2004-2011 Hisham H. Muhammad
 (C) 2020 Red Hat, Inc.  All Rights Reserved.
-Released under the GNU GPL, see the COPYING file
+Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "Process.h"
+#include "config.h" // IWYU pragma: keep
+
 #include "ProcessList.h"
 
+#if defined(HAVE_LIBHWLOC) || defined(HAVE_LINUX_AFFINITY)
+#include <stdbool.h>
+
+#include "Object.h"
+#include "Process.h"
+#endif
+
+
+#if defined(HAVE_LIBHWLOC) && defined(HAVE_LINUX_AFFINITY)
+#error hwloc and linux affinity are mutual exclusive.
+#endif
+
+
 typedef struct Affinity_ {
    ProcessList* pl;
    int size;
@@ -30,6 +44,6 @@ Affinity* Affinity_get(Process* proc, ProcessList* pl);
 
 bool Affinity_set(Process* proc, Arg arg);
 
-#endif
+#endif /* HAVE_LIBHWLOC || HAVE_LINUX_AFFINITY */
 
 #endif