src/solaris/native/sun/awt/awt_LoadLibrary.c

*** 103,113 ****
      len = strlen(buf);
      p = strrchr(buf, '/');
  
      /*
       * The code below is responsible for:
!      * 1. Loading appropriate awt library, i.e. xawt/libmawt or headless/libwawt
       * 2. Setting "awt.toolkit" system property to use the appropriate Java toolkit class,
       *    (if user has specified the toolkit in env varialble)
       */
  
      propname = (*env)->NewStringUTF(env, "awt.toolkit");
--- 103,113 ----
      len = strlen(buf);
      p = strrchr(buf, '/');
  
      /*
       * The code below is responsible for:
!      * 1. Loading appropriate awt library, i.e. libawt_xawt or libawt_headless
       * 2. Setting "awt.toolkit" system property to use the appropriate Java toolkit class,
       *    (if user has specified the toolkit in env varialble)
       */
  
      propname = (*env)->NewStringUTF(env, "awt.toolkit");
*** 128,141 ****
          }
      }
  
      /* Calculate library name to load */
      if (AWTIsHeadless()) {
!         strncpy(p, "/headless/libmawt.so", MAXPATHLEN-len-1);
      } else {
          /* Default AWT Toolkit on Linux and Solaris is XAWT. */
!         strncpy(p, "/xawt/libmawt.so", MAXPATHLEN-len-1);
      }
  
      if (toolkit) {
          (*env)->DeleteLocalRef(env, toolkit);
      }
--- 128,141 ----
          }
      }
  
      /* Calculate library name to load */
      if (AWTIsHeadless()) {
!         strncpy(p, "/libawt_headless.so", MAXPATHLEN-len-1);
      } else {
          /* Default AWT Toolkit on Linux and Solaris is XAWT. */
!         strncpy(p, "/libawt_xawt.so", MAXPATHLEN-len-1);
      }
  
      if (toolkit) {
          (*env)->DeleteLocalRef(env, toolkit);
      }
*** 159,169 ****
  }
  
  /*
   * This entry point must remain in libawt.so as part of a contract
   * with the CDE variant of Java Media Framework. (sdtjmplay)
!  * Reflect this call over to the correct libmawt.so.
   */
  JNIEXPORT void JNICALL
  Java_sun_awt_motif_XsessionWMcommand(JNIEnv *env, jobject this,
                                       jobject frame, jstring jcommand)
  {
--- 159,169 ----
  }
  
  /*
   * This entry point must remain in libawt.so as part of a contract
   * with the CDE variant of Java Media Framework. (sdtjmplay)
!  * Reflect this call over to the correct libawt_<toolkit>.so.
   */
  JNIEXPORT void JNICALL
  Java_sun_awt_motif_XsessionWMcommand(JNIEnv *env, jobject this,
                                       jobject frame, jstring jcommand)
  {
*** 189,199 ****
  
  
  /*
   * This entry point must remain in libawt.so as part of a contract
   * with the CDE variant of Java Media Framework. (sdtjmplay)
!  * Reflect this call over to the correct libmawt.so.
   */
  JNIEXPORT void JNICALL
  Java_sun_awt_motif_XsessionWMcommand_New(JNIEnv *env, jobjectArray jargv)
  {
      typedef JNIEXPORT void JNICALL
--- 189,199 ----
  
  
  /*
   * This entry point must remain in libawt.so as part of a contract
   * with the CDE variant of Java Media Framework. (sdtjmplay)
!  * Reflect this call over to the correct libawt_<toolkit>.so.
   */
  JNIEXPORT void JNICALL
  Java_sun_awt_motif_XsessionWMcommand_New(JNIEnv *env, jobjectArray jargv)
  {
      typedef JNIEXPORT void JNICALL
*** 248,258 ****
  }
  
  
  /*
   * These entry point must remain in libawt.so ***for Java Plugin ONLY***
!  * Reflect this call over to the correct libmawt.so.
   */
  
  REFLECT_VOID_FUNCTION(getAwtLockFunctions,
                        (void (**AwtLock)(JNIEnv *), void (**AwtUnlock)(JNIEnv *),
                         void (**AwtNoFlushUnlock)(JNIEnv *), void *reserved),
--- 248,258 ----
  }
  
  
  /*
   * These entry point must remain in libawt.so ***for Java Plugin ONLY***
!  * Reflect this call over to the correct libawt_<toolkit>.so.
   */
  
  REFLECT_VOID_FUNCTION(getAwtLockFunctions,
                        (void (**AwtLock)(JNIEnv *), void (**AwtUnlock)(JNIEnv *),
                         void (**AwtNoFlushUnlock)(JNIEnv *), void *reserved),