diff options
| author | Steve Block <steveblock@google.com> | 2009-12-07 06:44:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-07 06:44:50 -0800 |
| commit | 99c4892c4dc329dc28f1fee13e1603613b80fd86 (patch) | |
| tree | 68fedd6510052622afedda1cd67a72d08a02d2c7 /WebCore/bridge/jni/jni_runtime.cpp | |
| parent | 86fdeb62ac10d536108a49065a7337ef5c4f2ffa (diff) | |
| parent | 1d68587ce0a52acb0cb724ac362cee0a14bf1e8f (diff) | |
| download | external_webkit-99c4892c4dc329dc28f1fee13e1603613b80fd86.zip external_webkit-99c4892c4dc329dc28f1fee13e1603613b80fd86.tar.gz external_webkit-99c4892c4dc329dc28f1fee13e1603613b80fd86.tar.bz2 | |
am 1d68587c: Moves JSC-specific functions from jni_utility and moves them to a new jsc/jni_utility_private.h.
Merge commit '1d68587ce0a52acb0cb724ac362cee0a14bf1e8f' into eclair-mr2-plus-aosp
* commit '1d68587ce0a52acb0cb724ac362cee0a14bf1e8f':
Moves JSC-specific functions from jni_utility and moves them to a new jsc/jni_utility_private.h.
Diffstat (limited to 'WebCore/bridge/jni/jni_runtime.cpp')
| -rw-r--r-- | WebCore/bridge/jni/jni_runtime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/bridge/jni/jni_runtime.cpp b/WebCore/bridge/jni/jni_runtime.cpp index d7d0696..be11981 100644 --- a/WebCore/bridge/jni/jni_runtime.cpp +++ b/WebCore/bridge/jni/jni_runtime.cpp @@ -28,8 +28,8 @@ #if ENABLE(MAC_JAVA_BRIDGE) -#include <jni_utility.h> - +#include "jni_utility.h" +#include "jni_utility_private.h" #include "runtime_array.h" #include "runtime_object.h" #include "runtime_root.h" |