# HG changeset patch
# User prappo
# Date 1539177212 -3600
# Node ID 1c8745e31fa37ff804bebc54e2a508934ccefc8e
# Parent  3be7d098f4a62fddecc9c31eabbd0fa4b1e46405
8212000: Verify exported symbols in java.base (libnet, libnio/ch)
Reviewed-by: alanb, chegar

diff -r 3be7d098f4a6 -r 1c8745e31fa3 src/java.base/share/native/libnet/net_util.h
--- a/src/java.base/share/native/libnet/net_util.h	Wed Oct 10 14:28:35 2018 +0200
+++ b/src/java.base/share/native/libnet/net_util.h	Wed Oct 10 14:13:32 2018 +0100
@@ -122,8 +122,6 @@
 
 JNIEXPORT void JNICALL NET_ThrowNew(JNIEnv *env, int errorNum, char *msg);
 
-int NET_GetError();
-
 void NET_ThrowCurrent(JNIEnv *env, char *msg);
 
 jfieldID NET_GetFileDescriptorID(JNIEnv *env);
@@ -202,7 +200,6 @@
 
 unsigned short in_cksum(unsigned short *addr, int len);
 
-JNIEXPORT jint JNICALL
-NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout);
+jint NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout);
 
 #endif /* NET_UTILS_H */
diff -r 3be7d098f4a6 -r 1c8745e31fa3 src/java.base/unix/native/libnet/net_util_md.c
--- a/src/java.base/unix/native/libnet/net_util_md.c	Wed Oct 10 14:28:35 2018 +0200
+++ b/src/java.base/unix/native/libnet/net_util_md.c	Wed Oct 10 14:13:32 2018 +0100
@@ -1546,7 +1546,7 @@
  * It returns the time left from the timeout (possibly 0), or -1 if it expired.
  */
 
-JNIEXPORT jint JNICALL
+jint
 NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout)
 {
     jlong prevNanoTime = JVM_NanoTime(env, 0);
diff -r 3be7d098f4a6 -r 1c8745e31fa3 src/java.base/unix/native/libnio/ch/Net.c
--- a/src/java.base/unix/native/libnio/ch/Net.c	Wed Oct 10 14:28:35 2018 +0200
+++ b/src/java.base/unix/native/libnio/ch/Net.c	Wed Oct 10 14:13:32 2018 +0100
@@ -747,8 +747,7 @@
 
 /* Declared in nio_util.h */
 
-JNIEXPORT jint JNICALL
-handleSocketError(JNIEnv *env, jint errorValue)
+jint handleSocketError(JNIEnv *env, jint errorValue)
 {
     char *xn;
     switch (errorValue) {
diff -r 3be7d098f4a6 -r 1c8745e31fa3 src/java.base/unix/native/libnio/ch/nio_util.h
--- a/src/java.base/unix/native/libnio/ch/nio_util.h	Wed Oct 10 14:28:35 2018 +0200
+++ b/src/java.base/unix/native/libnio/ch/nio_util.h	Wed Oct 10 14:13:32 2018 +0100
@@ -62,5 +62,4 @@
 
 /* Defined in Net.c */
 
-JNIEXPORT jint JNICALL
-handleSocketError(JNIEnv *env, jint errorValue);
+jint handleSocketError(JNIEnv *env, jint errorValue);
diff -r 3be7d098f4a6 -r 1c8745e31fa3 src/java.base/windows/native/libnet/net_util_md.c
--- a/src/java.base/windows/native/libnet/net_util_md.c	Wed Oct 10 14:28:35 2018 +0200
+++ b/src/java.base/windows/native/libnet/net_util_md.c	Wed Oct 10 14:13:32 2018 +0100
@@ -903,7 +903,7 @@
  * It returns the time left from the timeout, or -1 if it expired.
  */
 
-JNIEXPORT jint JNICALL
+jint
 NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout)
 {
     jlong prevTime = JVM_CurrentTimeMillis(env, 0);