diff options
Diffstat (limited to 'lingucomponent')
-rw-r--r-- | lingucomponent/source/languageguessing/guess.cxx | 7 | ||||
-rw-r--r-- | lingucomponent/source/languageguessing/simpleguesser.cxx | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx index 4c8ed8e843f3..baf1e3796072 100644 --- a/lingucomponent/source/languageguessing/guess.cxx +++ b/lingucomponent/source/languageguessing/guess.cxx @@ -57,9 +57,16 @@ Guess::Guess(const char * guess_str) // && // strncmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_SHORT, strlen(_TEXTCAT_RESULT_SHORT)) != 0) // { +// FIXME just a temporary check until new version with renamed macros deployed +#if EXTTEXTCAT_VERSION_MAJOR > 3 || (EXTTEXTCAT_VERSION_MAJOR == 3 && (EXTTEXTCAT_VERSION_MINOR > 4 || (EXTTEXTCAT_VERSION_MINOR == 4 && (EXTTEXTCAT_VERSION_MICRO >= 1)))) if(strcmp((const char*)(guess_str + 1), TEXTCAT_RESULT_UNKNOWN_STR) != 0 && strcmp((const char*)(guess_str + 1), TEXTCAT_RESULT_SHORT_STR) != 0) +#else + if(strcmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_UNKNOWN) != 0 + && + strcmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_SHORT) != 0) +#endif { int current_pointer = 0; diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx index ac171b14c908..af9bf440f921 100644 --- a/lingucomponent/source/languageguessing/simpleguesser.cxx +++ b/lingucomponent/source/languageguessing/simpleguesser.cxx @@ -128,7 +128,12 @@ vector<Guess> SimpleGuesser::GuessLanguage(const char* text) const char *guess_list = textcat_Classify(h, text, len); +// FIXME just a temporary check until new version with renamed macros deployed +#if EXTTEXTCAT_VERSION_MAJOR > 3 || (EXTTEXTCAT_VERSION_MAJOR == 3 && (EXTTEXTCAT_VERSION_MINOR > 4 || (EXTTEXTCAT_VERSION_MINOR == 4 && (EXTTEXTCAT_VERSION_MICRO >= 1)))) if (strcmp(guess_list, TEXTCAT_RESULT_SHORT_STR) == 0) +#else + if (strcmp(guess_list, _TEXTCAT_RESULT_SHORT) == 0) +#endif return guesses; int current_pointer = 0; |