Mercurial > hg > graal-jvmci-8
diff src/share/vm/prims/jni_md.h @ 2044:06f017f7daa7
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Fri, 07 Jan 2011 18:18:08 +0100 |
parents | f95d63e2154a |
children | b92c45f2bc75 |
line wrap: on
line diff
--- a/src/share/vm/prims/jni_md.h Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/prims/jni_md.h Fri Jan 07 18:18:08 2011 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -24,7 +24,16 @@ */ /* Switch to the correct jni_md.h file without reliance on -I options. */ -#include "incls/_jni_pd.h.incl" +#ifdef TARGET_ARCH_x86 +# include "jni_x86.h" +#endif +#ifdef TARGET_ARCH_sparc +# include "jni_sparc.h" +#endif +#ifdef TARGET_ARCH_zero +# include "jni_zero.h" +#endif + /* The local copies of JNI header files may be refreshed