1.1 --- a/src/share/vm/prims/jni.cpp Tue Nov 23 15:01:43 2010 -0500 1.2 +++ b/src/share/vm/prims/jni.cpp Tue Nov 23 13:22:55 2010 -0800 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -22,8 +22,72 @@ 1.11 * 1.12 */ 1.13 1.14 -# include "incls/_precompiled.incl" 1.15 -# include "incls/_jni.cpp.incl" 1.16 +#include "precompiled.hpp" 1.17 +#include "classfile/classLoader.hpp" 1.18 +#include "classfile/javaClasses.hpp" 1.19 +#include "classfile/symbolTable.hpp" 1.20 +#include "classfile/systemDictionary.hpp" 1.21 +#include "classfile/vmSymbols.hpp" 1.22 +#include "interpreter/linkResolver.hpp" 1.23 +#include "memory/allocation.inline.hpp" 1.24 +#include "memory/gcLocker.inline.hpp" 1.25 +#include "memory/oopFactory.hpp" 1.26 +#include "memory/universe.inline.hpp" 1.27 +#include "oops/instanceKlass.hpp" 1.28 +#include "oops/instanceOop.hpp" 1.29 +#include "oops/markOop.hpp" 1.30 +#include "oops/methodOop.hpp" 1.31 +#include "oops/objArrayKlass.hpp" 1.32 +#include "oops/objArrayOop.hpp" 1.33 +#include "oops/oop.inline.hpp" 1.34 +#include "oops/symbolOop.hpp" 1.35 +#include "oops/typeArrayKlass.hpp" 1.36 +#include "oops/typeArrayOop.hpp" 1.37 +#include "prims/jni.h" 1.38 +#include "prims/jniCheck.hpp" 1.39 +#include "prims/jniFastGetField.hpp" 1.40 +#include "prims/jvm.h" 1.41 +#include "prims/jvm_misc.hpp" 1.42 +#include "prims/jvmtiExport.hpp" 1.43 +#include "prims/jvmtiThreadState.hpp" 1.44 +#include "runtime/compilationPolicy.hpp" 1.45 +#include "runtime/fieldDescriptor.hpp" 1.46 +#include "runtime/fprofiler.hpp" 1.47 +#include "runtime/handles.inline.hpp" 1.48 +#include "runtime/interfaceSupport.hpp" 1.49 +#include "runtime/java.hpp" 1.50 +#include "runtime/javaCalls.hpp" 1.51 +#include "runtime/jfieldIDWorkaround.hpp" 1.52 +#include "runtime/reflection.hpp" 1.53 +#include "runtime/sharedRuntime.hpp" 1.54 +#include "runtime/signature.hpp" 1.55 +#include "runtime/vm_operations.hpp" 1.56 +#include "services/runtimeService.hpp" 1.57 +#include "utilities/defaultStream.hpp" 1.58 +#include "utilities/dtrace.hpp" 1.59 +#include "utilities/events.hpp" 1.60 +#include "utilities/histogram.hpp" 1.61 +#ifdef TARGET_ARCH_x86 1.62 +# include "jniTypes_x86.hpp" 1.63 +#endif 1.64 +#ifdef TARGET_ARCH_sparc 1.65 +# include "jniTypes_sparc.hpp" 1.66 +#endif 1.67 +#ifdef TARGET_ARCH_zero 1.68 +# include "jniTypes_zero.hpp" 1.69 +#endif 1.70 +#ifdef TARGET_OS_FAMILY_linux 1.71 +# include "os_linux.inline.hpp" 1.72 +# include "thread_linux.inline.hpp" 1.73 +#endif 1.74 +#ifdef TARGET_OS_FAMILY_solaris 1.75 +# include "os_solaris.inline.hpp" 1.76 +# include "thread_solaris.inline.hpp" 1.77 +#endif 1.78 +#ifdef TARGET_OS_FAMILY_windows 1.79 +# include "os_windows.inline.hpp" 1.80 +# include "thread_windows.inline.hpp" 1.81 +#endif 1.82 1.83 static jint CurrentVersion = JNI_VERSION_1_6; 1.84