Mercurial > hg > graal-jvmci-8
diff src/share/vm/prims/jvmtiCodeBlobEvents.hpp @ 2044:06f017f7daa7
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Fri, 07 Jan 2011 18:18:08 +0100 |
parents | f95d63e2154a |
children | 8b46b0196eb0 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiCodeBlobEvents.hpp Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/prims/jvmtiCodeBlobEvents.hpp Fri Jan 07 18:18:08 2011 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -#ifndef _JVMTI_CODE_BLOB_EVENTS_H_ -#define _JVMTI_CODE_BLOB_EVENTS_H_ +#ifndef SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP +#define SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP + +#ifndef JVMTI_KERNEL +#include "jvmtifiles/jvmti.h" +#endif // forward declaration class JvmtiEnv; @@ -51,4 +55,4 @@ jint *map_length); }; -#endif +#endif // SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP