Mercurial > hg > graal-compiler
comparison src/share/vm/prims/jvmtiEnv.cpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | 291ffc492eb6 8b46b0196eb0 |
children | 836a62f43af9 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
645 JvmtiEnv::GetJLocationFormat(jvmtiJlocationFormat* format_ptr) { | 645 JvmtiEnv::GetJLocationFormat(jvmtiJlocationFormat* format_ptr) { |
646 *format_ptr = JVMTI_JLOCATION_JVMBCI; | 646 *format_ptr = JVMTI_JLOCATION_JVMBCI; |
647 return JVMTI_ERROR_NONE; | 647 return JVMTI_ERROR_NONE; |
648 } /* end GetJLocationFormat */ | 648 } /* end GetJLocationFormat */ |
649 | 649 |
650 #ifndef JVMTI_KERNEL | |
651 | |
652 // | 650 // |
653 // Thread functions | 651 // Thread functions |
654 // | 652 // |
655 | 653 |
656 // Threads_lock NOT held | 654 // Threads_lock NOT held |
3434 } | 3432 } |
3435 } | 3433 } |
3436 } | 3434 } |
3437 return err; | 3435 return err; |
3438 } /* end SetSystemProperty */ | 3436 } /* end SetSystemProperty */ |
3439 | |
3440 #endif // !JVMTI_KERNEL |