comparison src/os/bsd/vm/os_bsd.cpp @ 12990:e006d2e25bc7

8025673: [macosx] Disable X11 AWT toolkit Summary: Disable but not completely remove the XAWT and headless toolkits on Mac OS X Reviewed-by: dholmes Contributed-by: david.dehaven@oracle.com
author dholmes
date Thu, 24 Oct 2013 20:47:18 -0400
parents 3e265ce4d2dd
children 3b32d287da89
comparison
equal deleted inserted replaced
12925:4589b398ab03 12990:e006d2e25bc7
4744 // 4744 //
4745 // Since JDK8 xawt/libmawt.so was moved into the same directory 4745 // Since JDK8 xawt/libmawt.so was moved into the same directory
4746 // as libawt.so, and renamed libawt_xawt.so 4746 // as libawt.so, and renamed libawt_xawt.so
4747 // 4747 //
4748 bool os::is_headless_jre() { 4748 bool os::is_headless_jre() {
4749 #ifdef __APPLE__
4750 // We no longer build headless-only on Mac OS X
4751 return false;
4752 #else
4749 struct stat statbuf; 4753 struct stat statbuf;
4750 char buf[MAXPATHLEN]; 4754 char buf[MAXPATHLEN];
4751 char libmawtpath[MAXPATHLEN]; 4755 char libmawtpath[MAXPATHLEN];
4752 const char *xawtstr = "/xawt/libmawt" JNI_LIB_SUFFIX; 4756 const char *xawtstr = "/xawt/libmawt" JNI_LIB_SUFFIX;
4753 const char *new_xawtstr = "/libawt_xawt" JNI_LIB_SUFFIX; 4757 const char *new_xawtstr = "/libawt_xawt" JNI_LIB_SUFFIX;
4775 strcpy(libmawtpath, buf); 4779 strcpy(libmawtpath, buf);
4776 strcat(libmawtpath, new_xawtstr); 4780 strcat(libmawtpath, new_xawtstr);
4777 if (::stat(libmawtpath, &statbuf) == 0) return false; 4781 if (::stat(libmawtpath, &statbuf) == 0) return false;
4778 4782
4779 return true; 4783 return true;
4784 #endif
4780 } 4785 }
4781 4786
4782 // Get the default path to the core file 4787 // Get the default path to the core file
4783 // Returns the length of the string 4788 // Returns the length of the string
4784 int os::get_core_path(char* buffer, size_t bufferSize) { 4789 int os::get_core_path(char* buffer, size_t bufferSize) {