Hacks to get gres.c compiling

diff --git a/slurm/patches/patch-src_common_gres.c b/slurm/patches/patch-src_common_gres.c
index 9df1e617aa288704100d44701885f9a86d5bf9c5..583669d3581340e2168cda4dff71b65fd13297ca 100644 (file)
--- a/slurm/patches/patch-src_common_gres.c
+++ b/slurm/patches/patch-src_common_gres.c
@@ -2,16 +2,22 @@ $NetBSD$
 
 --- gres.c.orig        2016-05-03 22:41:59.000000000 +0000
 +++ gres.c
-@@ -79,6 +79,14 @@ typedef cpuset_t cpu_set_t;
+@@ -79,6 +79,20 @@ typedef cpuset_t cpu_set_t;
  #include <sys/stat.h>
  #include <math.h>
  
 +#ifdef __NetBSD__
-+typedef cpuset_t cpu_set_t;
 +#define       CPU_ZERO(p) cpuset_zero((p))
 +#define CPU_ISSET(i,c) cpuset_isset((i),(c))
 +#define sched_getaffinity sched_getaffinity_np
 +#define SCHED_GETAFFINITY_THREE_ARGS
++
++// http://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/common/lib/libc/sys/cpuset.c
++struct _cpuset {
++      uint32_t        bits[0];
++};
++
++typedef cpuset_t cpu_set_t;
 +#endif
 +
  #include "slurm/slurm.h"