6835668: Use of /usr/include/linux/ files creates a dependence on kernel-headers
Reviewed-by: chegar
--- a/jdk/src/solaris/native/java/net/NetworkInterface.c Thu Feb 24 13:42:10 2011 +0000
+++ b/jdk/src/solaris/native/java/net/NetworkInterface.c Thu Feb 24 18:35:17 2011 +0000
@@ -45,7 +45,6 @@
#ifdef __linux__
#include <sys/ioctl.h>
#include <bits/ioctls.h>
-#include <linux/sockios.h>
#include <sys/utsname.h>
#include <stdio.h>
#endif
--- a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Thu Feb 24 13:42:10 2011 +0000
+++ b/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Thu Feb 24 18:35:17 2011 +0000
@@ -34,8 +34,8 @@
#include <fcntl.h>
#endif
#ifdef __linux__
-#include <linux/unistd.h>
-#include <linux/sysctl.h>
+#include <unistd.h>
+#include <sys/sysctl.h>
#include <sys/utsname.h>
#include <netinet/ip.h>
--- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c Thu Feb 24 13:42:10 2011 +0000
+++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c Thu Feb 24 18:35:17 2011 +0000
@@ -42,8 +42,8 @@
#include <fcntl.h>
#endif
#ifdef __linux__
-#include <linux/unistd.h>
-#include <linux/sysctl.h>
+#include <unistd.h>
+#include <sys/sysctl.h>
#endif
#include "jvm.h"