# HG changeset patch
# User michaelm
# Date 1572436387 0
# Node ID b2f0339a4cad09fedd725f083e0a02473577972b
# Parent  c3df0f8b6d9316a7bcb320e5acbd87662c05b7f7
removing unnecessary diffs from mainline

diff -r c3df0f8b6d93 -r b2f0339a4cad src/java.base/unix/classes/sun/nio/ch/NativeThread.java
--- a/src/java.base/unix/classes/sun/nio/ch/NativeThread.java	Tue Oct 29 19:55:34 2019 +0000
+++ b/src/java.base/unix/classes/sun/nio/ch/NativeThread.java	Wed Oct 30 11:53:07 2019 +0000
@@ -37,19 +37,19 @@
 // always returns -1 and the signal(long) method has no effect.
 
 
-class NativeThread {
+public class NativeThread {
 
     // Returns an opaque token representing the native thread underlying the
     // invoking Java thread.  On systems that do not require signalling, this
     // method always returns -1.
     //
-    static native long current();
+    public static native long current();
 
     // Signals the given native thread so as to release it from a blocking I/O
     // operation.  On systems that do not require signalling, this method has
     // no effect.
     //
-    static native void signal(long nt);
+    public static native void signal(long nt);
 
     private static native void init();
 
diff -r c3df0f8b6d93 -r b2f0339a4cad src/java.base/unix/native/libnio/ch/IOUtil.c
--- a/src/java.base/unix/native/libnio/ch/IOUtil.c	Tue Oct 29 19:55:34 2019 +0000
+++ b/src/java.base/unix/native/libnio/ch/IOUtil.c	Wed Oct 30 11:53:07 2019 +0000
@@ -223,12 +223,14 @@
     }
 }
 
-jint fdval(JNIEnv *env, jobject fdo)
+jint
+fdval(JNIEnv *env, jobject fdo)
 {
     return (*env)->GetIntField(env, fdo, fd_fdID);
 }
 
-void setfdval(JNIEnv *env, jobject fdo, jint val) {
+void
+setfdval(JNIEnv *env, jobject fdo, jint val) {
     (*env)->SetIntField(env, fdo, fd_fdID, val);
 }
 
diff -r c3df0f8b6d93 -r b2f0339a4cad src/java.base/unix/native/libnio/ch/Net.c
--- a/src/java.base/unix/native/libnio/ch/Net.c	Tue Oct 29 19:55:34 2019 +0000
+++ b/src/java.base/unix/native/libnio/ch/Net.c	Wed Oct 30 11:53:07 2019 +0000
@@ -53,7 +53,6 @@
 
 JNIEXPORT jobject JNICALL
 NET_SockaddrToUnixAddress(JNIEnv *env, SOCKETADDRESS *sa) {
-    jboolean isAbstract = 0;
 
     if (sa->sa.sa_family == AF_UNIX) {
         char *name = sa->saun.sun_path;
diff -r c3df0f8b6d93 -r b2f0339a4cad src/java.base/windows/classes/sun/nio/ch/NativeThread.java
--- a/src/java.base/windows/classes/sun/nio/ch/NativeThread.java	Tue Oct 29 19:55:34 2019 +0000
+++ b/src/java.base/windows/classes/sun/nio/ch/NativeThread.java	Wed Oct 30 11:53:07 2019 +0000
@@ -38,4 +38,5 @@
     }
 
     static void signal(long nt) { }
+
 }
diff -r c3df0f8b6d93 -r b2f0339a4cad src/java.base/windows/native/libnio/ch/IOUtil.c
--- a/src/java.base/windows/native/libnio/ch/IOUtil.c	Tue Oct 29 19:55:34 2019 +0000
+++ b/src/java.base/windows/native/libnio/ch/IOUtil.c	Wed Oct 30 11:53:07 2019 +0000
@@ -192,12 +192,14 @@
 /* Note: This function returns the int fd value from file descriptor.
    It is mostly used for sockets which should use the int fd value.
 */
-jint fdval(JNIEnv *env, jobject fdo)
+jint
+fdval(JNIEnv *env, jobject fdo)
 {
     return (*env)->GetIntField(env, fdo, fd_fdID);
 }
 
-void setfdval(JNIEnv *env, jobject fdo, jint val)
+void
+setfdval(JNIEnv *env, jobject fdo, jint val)
 {
     (*env)->SetIntField(env, fdo, fd_fdID, val);
 }