diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-03-25 19:09:50 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-03-25 19:12:25 +0100 |
| commit | a81f44c707c4df56e7b999fa3b656d7fa4543d1b (patch) | |
| tree | 96a3468d2a604efd8be97411ae16ce20e337abfb /lingucomponent | |
| parent | f8a3582d4cbcf6a705f724b921e370c739ecee35 (diff) | |
libexttextcat: fix the --with-system case too...
... by introducing a version check that is so horribly ugly that it will
hopefully be removed again as soon as a new upstream release with the
rename is available.
Change-Id: I8e0409ba7331dec7140d2a4a49720c804e90582f
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; |