New upstream version 3.0.2upstream/3.0.2

1 files changed, 6 insertions, 24 deletions

diff --git a/Affinity.h b/Affinity.h
index 3c71603..20d0047 100644
--- a/Affinity.h
+++ b/Affinity.h
@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_Affinity
 #define HEADER_Affinity
 /*
@@ -10,15 +8,6 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
-#ifdef HAVE_LIBHWLOC
-#if __linux__
-#define HTOP_HWLOC_CPUBIND_FLAG HWLOC_CPUBIND_THREAD
-#else
-#define HTOP_HWLOC_CPUBIND_FLAG HWLOC_CPUBIND_PROCESS
-#endif
-#elif HAVE_LINUX_AFFINITY
-#endif
-
 #include "Process.h"
 #include "ProcessList.h"
 
@@ -29,24 +18,17 @@ typedef struct Affinity_ {
    int* cpus;
 } Affinity;
 
+Affinity* Affinity_new(ProcessList* pl);
 
-extern Affinity* Affinity_new(ProcessList* pl);
-
-extern void Affinity_delete(Affinity* this);
-
-extern void Affinity_add(Affinity* this, int id);
-
-#ifdef HAVE_LIBHWLOC
-
-extern Affinity* Affinity_get(Process* proc, ProcessList* pl);
+void Affinity_delete(Affinity* this);
 
-extern bool Affinity_set(Process* proc, Arg arg);
+void Affinity_add(Affinity* this, int id);
 
-#elif HAVE_LINUX_AFFINITY
+#if defined(HAVE_LIBHWLOC) || defined(HAVE_LINUX_AFFINITY)
 
-extern Affinity* Affinity_get(Process* proc, ProcessList* pl);
+Affinity* Affinity_get(Process* proc, ProcessList* pl);
 
-extern bool Affinity_set(Process* proc, Arg arg);
+bool Affinity_set(Process* proc, Arg arg);
 
 #endif