Merge

Mon, 28 Oct 2013 16:02:40 -0700

author
katleman
date
Mon, 28 Oct 2013 16:02:40 -0700
changeset 6016
913a35723a0a
parent 5951
4a1128861221
parent 6015
e006d2e25bc7
child 6017
7fd913010dbb

Merge

     1.1 --- a/src/os/bsd/vm/os_bsd.cpp	Thu Oct 24 09:10:27 2013 -0700
     1.2 +++ b/src/os/bsd/vm/os_bsd.cpp	Mon Oct 28 16:02:40 2013 -0700
     1.3 @@ -4746,6 +4746,10 @@
     1.4  // as libawt.so, and renamed libawt_xawt.so
     1.5  //
     1.6  bool os::is_headless_jre() {
     1.7 +#ifdef __APPLE__
     1.8 +    // We no longer build headless-only on Mac OS X
     1.9 +    return false;
    1.10 +#else
    1.11      struct stat statbuf;
    1.12      char buf[MAXPATHLEN];
    1.13      char libmawtpath[MAXPATHLEN];
    1.14 @@ -4777,6 +4781,7 @@
    1.15      if (::stat(libmawtpath, &statbuf) == 0) return false;
    1.16  
    1.17      return true;
    1.18 +#endif
    1.19  }
    1.20  
    1.21  // Get the default path to the core file

mercurial