diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-08-01 02:52:29 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-01 02:52:29 -0700 |
| commit | 5e5d0b83a6d0180f67bf7a381ccec9d28500320b (patch) | |
| tree | 63883ae577a565e3f969dcac7e220904e2e4de07 | |
| parent | dcc80c139562ee611c9aac94529553e936346866 (diff) | |
| parent | bc8924467eae6cc5dc456cb1fbe4ec97b5b9cf9b (diff) | |
| download | latinime-5e5d0b83a6d0180f67bf7a381ccec9d28500320b.tar.gz latinime-5e5d0b83a6d0180f67bf7a381ccec9d28500320b.tar.xz latinime-5e5d0b83a6d0180f67bf7a381ccec9d28500320b.zip | |
am bc892446: am 74fb957e: Header cleanup
* commit 'bc8924467eae6cc5dc456cb1fbe4ec97b5b9cf9b':
Header cleanup
| -rw-r--r-- | native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp | 5 | ||||
| -rw-r--r-- | native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp | 12 | ||||
| -rw-r--r-- | native/jni/jni_common.cpp | 1 | ||||
| -rw-r--r-- | native/jni/src/correction.cpp | 3 |
4 files changed, 6 insertions, 15 deletions
diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp index fb55ea76a..93e19b367 100644 --- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp +++ b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp @@ -21,11 +21,6 @@ #include "jni_common.h" #include "proximity_info.h" -#include <cassert> -#include <cerrno> -#include <cstdio> -#include <cstring> - namespace latinime { static jlong latinime_Keyboard_setProximityInfo(JNIEnv *env, jobject object, diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp index 435e8379d..2d3d96309 100644 --- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp +++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp @@ -17,30 +17,24 @@ #define LOG_TAG "LatinIME: jni: BinaryDictionary" #include "binary_format.h" -#include "correction.h" #include "com_android_inputmethod_latin_BinaryDictionary.h" +#include "correction.h" #include "defines.h" #include "dictionary.h" #include "jni.h" #include "jni_common.h" -#include "proximity_info.h" - -#include <cassert> -#include <cerrno> -#include <cstdio> #ifdef USE_MMAP_FOR_DICTIONARY #include <sys/mman.h> -#include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> -#include <unistd.h> #else // USE_MMAP_FOR_DICTIONARY #include <cstdlib> #endif // USE_MMAP_FOR_DICTIONARY namespace latinime { +class ProximityInfo; + void releaseDictBuf(void *dictBuf, const size_t length, int fd); static jlong latinime_BinaryDictionary_open(JNIEnv *env, jobject object, diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp index 94e279ff9..cb2351db1 100644 --- a/native/jni/jni_common.cpp +++ b/native/jni/jni_common.cpp @@ -21,6 +21,7 @@ #include "com_android_inputmethod_latin_NativeUtils.h" #include "defines.h" #include "jni.h" +#include "jni_common.h" #include "proximity_info.h" #include <cassert> diff --git a/native/jni/src/correction.cpp b/native/jni/src/correction.cpp index 921ab0a28..8bb27f52a 100644 --- a/native/jni/src/correction.cpp +++ b/native/jni/src/correction.cpp @@ -25,11 +25,12 @@ #include "correction.h" #include "defines.h" #include "dictionary.h" -#include "proximity_info.h" #include "proximity_info_state.h" namespace latinime { +class ProximityInfo; + ///////////////////////////// // edit distance funcitons // ///////////////////////////// |