diff options
| author | Adam <Adam@anope.org> | 2014-05-31 16:58:31 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-05-31 18:30:50 -0400 |
| commit | 16e0b72d2dd90bcbcfaea9bb0dc5ee9ed8cd091b (patch) | |
| tree | d684a801f53fa1a0f81e9dea1e6f40e4bb224e0b /src | |
| parent | b578e3253184993864d4aee2391966fcf3e26659 (diff) | |
Update FindGettext.cmake for new Windows stuff and fix language.cpp
compile
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/language.cpp | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index be3f1010f..3a07f7f13 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -86,11 +86,7 @@ if(WIN32) target_link_libraries(${PROGRAM_NAME} wsock32 Ws2_32 ${LINK_LIBS} ${GETTEXT_LIBRARIES} ${WIN32_MEMORY}) set_target_properties(${PROGRAM_NAME} PROPERTIES VERSION "${VERSION_DOTTED}") else(WIN32) - if(GETTEXT_LIBRARIES) - target_link_libraries(${PROGRAM_NAME} ${LINK_LIBS} ${GETTEXT_LIBRARIES}) - else(GETTEXT_LIBRARIES) - target_link_libraries(${PROGRAM_NAME} ${LINK_LIBS}) - endif(GETTEXT_LIBRARIES) + target_link_libraries(${PROGRAM_NAME} ${LINK_LIBS} ${GETTEXT_LIBRARIES}) endif(WIN32) # Building the Anope executable requires the version.h header to be generated add_dependencies(${PROGRAM_NAME} headers) diff --git a/src/language.cpp b/src/language.cpp index 3404daba3..5ff344281 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -76,8 +76,6 @@ const char *Language::Translate(const NickCore *nc, const char *string) #if GETTEXT_FOUND -extern "C" int _nl_msg_cat_cntr; - const char *Language::Translate(const char *lang, const char *string) { if (!string || !*string) @@ -86,7 +84,6 @@ const char *Language::Translate(const char *lang, const char *string) if (!lang || !*lang) lang = Config->DefLanguage.c_str(); - ++_nl_msg_cat_cntr; #ifdef _WIN32 SetThreadLocale(MAKELCID(MAKELANGID(WindowsGetLanguage(lang), SUBLANG_DEFAULT), SORT_DEFAULT)); #else |