diff options
Diffstat (limited to 'native/src/defines.h')
| -rw-r--r-- | native/src/defines.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/native/src/defines.h b/native/src/defines.h index ffadb11c5..afa1e0404 100644 --- a/native/src/defines.h +++ b/native/src/defines.h @@ -25,9 +25,9 @@ #define DUMP_WORD(word, length) do { dumpWord(word, length); } while(0) -static char charBuf[50]; +static inline void dumpWord(const unsigned short* word, const int length) { + static char charBuf[50]; -static void dumpWord(const unsigned short* word, const int length) { for (int i = 0; i < length; ++i) { charBuf[i] = word[i]; } @@ -43,7 +43,6 @@ static void dumpWord(const unsigned short* word, const int length) { #ifdef FLAG_DO_PROFILE // Profiler -#include <cutils/log.h> #include <time.h> #define PROF_BUF_SIZE 100 @@ -62,7 +61,7 @@ static unsigned int profile_counter[PROF_BUF_SIZE]; AKLOGI("%s : clock is %f", __FUNCTION__, (clock() - profile_old[prof_buf_id])) #define PROF_OUTALL do { AKLOGI("--- %s ---", __FUNCTION__); prof_out(); } while(0) -static void prof_reset(void) { +static inline void prof_reset(void) { for (int i = 0; i < PROF_BUF_SIZE; ++i) { profile_buf[i] = 0; profile_old[i] = 0; @@ -70,7 +69,7 @@ static void prof_reset(void) { } } -static void prof_out(void) { +static inline void prof_out(void) { if (profile_counter[PROF_BUF_SIZE - 1] != 1) { AKLOGI("Error: You must call PROF_OPEN before PROF_CLOSE."); } @@ -163,9 +162,6 @@ static void prof_out(void) { #define FLAG_BIGRAM_FREQ 0x7F #define DICTIONARY_VERSION_MIN 200 -// TODO: remove this constant when the switch to the new dict format is over -#define DICTIONARY_HEADER_SIZE 2 -#define NEW_DICTIONARY_HEADER_SIZE 5 #define NOT_VALID_WORD -99 #define NOT_A_CHARACTER -1 #define NOT_A_DISTANCE -1 |