# HG changeset patch
# User katleman
# Date 1383083790 25200
# Node ID 7fd913010dbbf75260688fd2fa8964763fa49a09
# Parent  bde83ddf920c0a391e830dbf8bb8943d0c0ded30# Parent  913a35723a0a4e59d0486aca610830952dff7696
Merge

diff -r bde83ddf920c -r 7fd913010dbb src/os/bsd/vm/os_bsd.cpp
--- a/src/os/bsd/vm/os_bsd.cpp	Fri Oct 25 13:29:18 2013 -0700
+++ b/src/os/bsd/vm/os_bsd.cpp	Tue Oct 29 14:56:30 2013 -0700
@@ -4746,6 +4746,10 @@
 // as libawt.so, and renamed libawt_xawt.so
 //
 bool os::is_headless_jre() {
+#ifdef __APPLE__
+    // We no longer build headless-only on Mac OS X
+    return false;
+#else
     struct stat statbuf;
     char buf[MAXPATHLEN];
     char libmawtpath[MAXPATHLEN];
@@ -4777,6 +4781,7 @@
     if (::stat(libmawtpath, &statbuf) == 0) return false;
 
     return true;
+#endif
 }
 
 // Get the default path to the core file