src/java.base/unix/native/libnio/ch/NativeThread.c

rev 59105 : imported patch corelibs

@@ -39,13 +39,10 @@
   #define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
 #elif defined(_AIX)
   #include <pthread.h>
   /* Also defined in net/aix_close.c */
   #define INTERRUPT_SIGNAL (SIGRTMAX - 1)
-#elif defined(__solaris__)
-  #include <thread.h>
-  #define INTERRUPT_SIGNAL (SIGRTMAX - 2)
 #elif defined(_ALLBSD_SOURCE)
   #include <pthread.h>
   /* Also defined in net/bsd_close.c */
   #define INTERRUPT_SIGNAL SIGIO
 #else

@@ -77,26 +74,18 @@
 }
 
 JNIEXPORT jlong JNICALL
 Java_sun_nio_ch_NativeThread_current(JNIEnv *env, jclass cl)
 {
-#ifdef __solaris__
-    return (jlong)thr_self();
-#else
     return (jlong)pthread_self();
-#endif
 }
 
 JNIEXPORT void JNICALL
 Java_sun_nio_ch_NativeThread_signal(JNIEnv *env, jclass cl, jlong thread)
 {
     int ret;
-#ifdef __solaris__
-    ret = thr_kill((thread_t)thread, INTERRUPT_SIGNAL);
-#else
     ret = pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL);
-#endif
 #ifdef MACOSX
     if (ret != 0 && ret != ESRCH)
 #else
     if (ret != 0)
 #endif