Merge pull request #90 from tnn2/sys-user_h-removal

<sys/user.h> was removed from NetBSD
battleblow · Oct 15, 2019 · f757ae2 · f757ae2
2 parents d2b2fce + 81ec8e5
commit f757ae2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/hotspot/os/bsd/os_perf_bsd.cpp b/src/hotspot/os/bsd/os_perf_bsd.cpp
@@ -34,7 +34,9 @@
   #include <mach/mach.h>
   #include <mach/task_info.h>
 #else
-  #include <sys/user.h>
+  #ifndef __NetBSD__
+    #include <sys/user.h>
+  #endif
   #include <sys/sched.h>
   #include <sys/resource.h>
   #define NET_RT_IFLIST2 NET_RT_IFLIST

diff --git a/src/jdk.management/bsd/native/libmanagement_ext/UnixOperatingSystem.c b/src/jdk.management/bsd/native/libmanagement_ext/UnixOperatingSystem.c
@@ -29,7 +29,9 @@
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
-#include <sys/user.h>
+#ifndef __NetBSD__
+  #include <sys/user.h>
+#endif
 #include <unistd.h>
 
 #include "jvm.h"