summaryrefslogtreecommitdiffstats
path: root/vm/interp
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2011-05-10 12:21:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-10 12:21:54 -0700
commit1e8ccd20d4e7f493ac1be6c2683e3e180f03a4ff (patch)
treee6ddad86e31683852e0073641360ce854df7e118 /vm/interp
parent87b44e915093463ab852b04d116fcdcf96419214 (diff)
parent9c6f0a6a36fcce4a55e3764db45c6c7cced077a5 (diff)
downloadandroid_dalvik-1e8ccd20d4e7f493ac1be6c2683e3e180f03a4ff.tar.gz
android_dalvik-1e8ccd20d4e7f493ac1be6c2683e3e180f03a4ff.tar.bz2
android_dalvik-1e8ccd20d4e7f493ac1be6c2683e3e180f03a4ff.zip
Merge "Fixes to allow the debug VM configuration to build." into dalvik-dev
Diffstat (limited to 'vm/interp')
-rw-r--r--vm/interp/Stack.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/interp/Stack.h b/vm/interp/Stack.h
index 4e806b7ce..ec62e1180 100644
--- a/vm/interp/Stack.h
+++ b/vm/interp/Stack.h
@@ -224,7 +224,7 @@ Object* dvmInvokeMethod(Object* invokeObj, const Method* meth,
* into the specified method. Returns -2 for native methods, -1 if no
* match was found.
*/
-int dvmLineNumFromPC(const Method* method, u4 relPc);
+extern "C" int dvmLineNumFromPC(const Method* method, u4 relPc);
/*
* Given a frame pointer, compute the current call depth. The value can be