Mercurial > hg > truffle

changeset 9629:f7e06c106dda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 09 May 2013 19:37:30 -0700
parents 8851fabf2265 (current diff) 1a009b20f816 (diff)
children cd0c173593a8
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/bsd/vm/gpu_bsd.cpp	Thu May 09 19:21:29 2013 -0700
+++ b/src/os/bsd/vm/gpu_bsd.cpp	Thu May 09 19:37:30 2013 -0700
@@ -26,7 +26,7 @@
 #include "utilities/ostream.hpp"
 
 #ifdef __APPLE__
-#include <CoreGraphics/CoreGraphics.h>
+#include <ApplicationServices/ApplicationServices.h>
 #include <IOKit/IOKitLib.h>
 #endif
 
@@ -96,4 +96,4 @@
   }
   return false;
 }
-#endif
\ No newline at end of file
+#endif
--- a/src/share/vm/runtime/globals.hpp	Thu May 09 19:21:29 2013 -0700
+++ b/src/share/vm/runtime/globals.hpp	Thu May 09 19:37:30 2013 -0700
@@ -3691,7 +3691,7 @@
   product(bool , AllowNonVirtualCalls, false,                               \
           "Obey the ACC_SUPER flag and allow invokenonvirtual calls")       \
                                                                             \
-  develop(bool, TraceWarpLoading, false,                                    \
+  product(bool, TraceWarpLoading, false,                                    \
           "trace external GPU warp loading")                                \
                                                                             \
   experimental(uintx, ArrayAllocatorMallocLimit,                            \