src/solaris/native/java/lang/java_props_md.c

Print this page

        

*** 308,318 **** return 1; } #ifdef JAVASE_EMBEDDED ! /* Determine the default embedded toolkit based on whether lib/xawt/ * exists in the JRE. This can still be overridden by -Dawt.toolkit=XXX */ static char* getEmbeddedToolkit() { Dl_info dlinfo; char buf[MAXPATHLEN]; --- 308,318 ---- return 1; } #ifdef JAVASE_EMBEDDED ! /* Determine the default embedded toolkit based on whether libawt_xawt * exists in the JRE. This can still be overridden by -Dawt.toolkit=XXX */ static char* getEmbeddedToolkit() { Dl_info dlinfo; char buf[MAXPATHLEN];
*** 323,334 **** /* Get address of this library and the directory containing it. */ dladdr((void *)getEmbeddedToolkit, &dlinfo); realpath((char *)dlinfo.dli_fname, buf); len = strlen(buf); p = strrchr(buf, '/'); ! /* Default AWT Toolkit on Linux and Solaris is XAWT. */ ! strncpy(p, "/xawt/", MAXPATHLEN-len-1); /* Check if it exists */ if (stat(buf, &statbuf) == -1 && errno == ENOENT) { /* No - this is a reduced-headless-jre so use special HToolkit */ return "sun.awt.HToolkit"; } --- 323,334 ---- /* Get address of this library and the directory containing it. */ dladdr((void *)getEmbeddedToolkit, &dlinfo); realpath((char *)dlinfo.dli_fname, buf); len = strlen(buf); p = strrchr(buf, '/'); ! /* Default AWT Toolkit on Linux and Solaris is XAWT (libawt_xawt.so). */ ! strncpy(p, "/libawt_xawt.so", MAXPATHLEN-len-1); /* Check if it exists */ if (stat(buf, &statbuf) == -1 && errno == ENOENT) { /* No - this is a reduced-headless-jre so use special HToolkit */ return "sun.awt.HToolkit"; }