am bc892446: am 74fb957e: Header cleanup

* commit 'bc8924467eae6cc5dc456cb1fbe4ec97b5b9cf9b':
  Header cleanup
main
Ken Wakasa 2012-08-01 02:52:29 -07:00 committed by Android Git Automerger
commit 5e5d0b83a6
4 changed files with 6 additions and 15 deletions

View File

@ -21,11 +21,6 @@
#include "jni_common.h" #include "jni_common.h"
#include "proximity_info.h" #include "proximity_info.h"
#include <cassert>
#include <cerrno>
#include <cstdio>
#include <cstring>
namespace latinime { namespace latinime {
static jlong latinime_Keyboard_setProximityInfo(JNIEnv *env, jobject object, static jlong latinime_Keyboard_setProximityInfo(JNIEnv *env, jobject object,

View File

@ -17,30 +17,24 @@
#define LOG_TAG "LatinIME: jni: BinaryDictionary" #define LOG_TAG "LatinIME: jni: BinaryDictionary"
#include "binary_format.h" #include "binary_format.h"
#include "correction.h"
#include "com_android_inputmethod_latin_BinaryDictionary.h" #include "com_android_inputmethod_latin_BinaryDictionary.h"
#include "correction.h"
#include "defines.h" #include "defines.h"
#include "dictionary.h" #include "dictionary.h"
#include "jni.h" #include "jni.h"
#include "jni_common.h" #include "jni_common.h"
#include "proximity_info.h"
#include <cassert>
#include <cerrno>
#include <cstdio>
#ifdef USE_MMAP_FOR_DICTIONARY #ifdef USE_MMAP_FOR_DICTIONARY
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h>
#else // USE_MMAP_FOR_DICTIONARY #else // USE_MMAP_FOR_DICTIONARY
#include <cstdlib> #include <cstdlib>
#endif // USE_MMAP_FOR_DICTIONARY #endif // USE_MMAP_FOR_DICTIONARY
namespace latinime { namespace latinime {
class ProximityInfo;
void releaseDictBuf(void *dictBuf, const size_t length, int fd); void releaseDictBuf(void *dictBuf, const size_t length, int fd);
static jlong latinime_BinaryDictionary_open(JNIEnv *env, jobject object, static jlong latinime_BinaryDictionary_open(JNIEnv *env, jobject object,

View File

@ -21,6 +21,7 @@
#include "com_android_inputmethod_latin_NativeUtils.h" #include "com_android_inputmethod_latin_NativeUtils.h"
#include "defines.h" #include "defines.h"
#include "jni.h" #include "jni.h"
#include "jni_common.h"
#include "proximity_info.h" #include "proximity_info.h"
#include <cassert> #include <cassert>

View File

@ -25,11 +25,12 @@
#include "correction.h" #include "correction.h"
#include "defines.h" #include "defines.h"
#include "dictionary.h" #include "dictionary.h"
#include "proximity_info.h"
#include "proximity_info_state.h" #include "proximity_info_state.h"
namespace latinime { namespace latinime {
class ProximityInfo;
///////////////////////////// /////////////////////////////
// edit distance funcitons // // edit distance funcitons //
///////////////////////////// /////////////////////////////