summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-04-08 15:15:34 -0700
committerColin Cross <ccross@android.com>2014-04-08 15:15:34 -0700
commit96403af9b78d4852f1ac86857a319e078e8fc93f (patch)
treec311539ce7bc086d17ad092c25a91596681fe50b /src
parent02abbd1281c751ed189ed316bf6e5e296f7aadf6 (diff)
downloadandroid_packages_apps_Terminal-96403af9b78d4852f1ac86857a319e078e8fc93f.tar.gz
android_packages_apps_Terminal-96403af9b78d4852f1ac86857a319e078e8fc93f.tar.bz2
android_packages_apps_Terminal-96403af9b78d4852f1ac86857a319e078e8fc93f.zip
Terminal: fix compiling for 64-bit
Use jlong to store the native pointer. Change-Id: I0d35871da53f08b8835c35a3675fb958e9ec230a
Diffstat (limited to 'src')
-rw-r--r--src/com/android/terminal/Terminal.java22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/com/android/terminal/Terminal.java b/src/com/android/terminal/Terminal.java
index cdf3f60..c8739b1 100644
--- a/src/com/android/terminal/Terminal.java
+++ b/src/com/android/terminal/Terminal.java
@@ -61,7 +61,7 @@ public class Terminal {
public void onBell();
}
- private final int mNativePtr;
+ private final long mNativePtr;
private final Thread mThread;
private String mTitle;
@@ -162,16 +162,16 @@ public class Terminal {
return nativeDispatchCharacter(mNativePtr, modifiers, character);
}
- private static native int nativeInit(TerminalCallbacks callbacks, int rows, int cols);
- private static native int nativeDestroy(int ptr);
+ private static native long nativeInit(TerminalCallbacks callbacks, int rows, int cols);
+ private static native int nativeDestroy(long ptr);
- private static native int nativeRun(int ptr);
- private static native int nativeResize(int ptr, int rows, int cols, int scrollRows);
- private static native int nativeGetCellRun(int ptr, int row, int col, CellRun run);
- private static native int nativeGetRows(int ptr);
- private static native int nativeGetCols(int ptr);
- private static native int nativeGetScrollRows(int ptr);
+ private static native int nativeRun(long ptr);
+ private static native int nativeResize(long ptr, int rows, int cols, int scrollRows);
+ private static native int nativeGetCellRun(long ptr, int row, int col, CellRun run);
+ private static native int nativeGetRows(long ptr);
+ private static native int nativeGetCols(long ptr);
+ private static native int nativeGetScrollRows(long ptr);
- private static native boolean nativeDispatchKey(int ptr, int modifiers, int key);
- private static native boolean nativeDispatchCharacter(int ptr, int modifiers, int character);
+ private static native boolean nativeDispatchKey(long ptr, int modifiers, int key);
+ private static native boolean nativeDispatchCharacter(long ptr, int modifiers, int character);
}