# HG changeset patch
# User katleman
# Date 1383001360 25200
# Node ID 913a35723a0a4e59d0486aca610830952dff7696
# Parent  4a11288612211f52bec774d9bd52c45ed5417e1d# Parent  e006d2e25bc73c2a56e553cd0bdbb623fbde964d
Merge

diff -r 4a1128861221 -r 913a35723a0a src/os/bsd/vm/os_bsd.cpp
--- a/src/os/bsd/vm/os_bsd.cpp	Thu Oct 24 09:10:27 2013 -0700
+++ b/src/os/bsd/vm/os_bsd.cpp	Mon Oct 28 16:02:40 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