Fix compilation under MSVC and remove unnecessary conditional function prototype

Thanks to SmallJoker for pointing this out.

diff --git a/src/gettext.cpp b/src/gettext.cpp
index 26b16f434fedf52a2102f7ac2c28e15b379050d2..1fab875e5e14745272beee1e12ff156695a3358a 100644 (file)
--- a/src/gettext.cpp
+++ b/src/gettext.cpp
@@ -117,12 +117,8 @@ const char* MSVC_LocaleLookup(const char* raw_shortname) {
 #endif
 
 /******************************************************************************/
-#ifdef _MSC_VER
 void init_gettext(const char *path, const std::string &configured_language,
-       int argc, const char *argv[])
-#else
-void init_gettext(const char *path, const std::string &configured_language)
-#endif
+       int argc, char *argv[])
 {
 #if USE_GETTEXT
        // First, try to set user override environment

diff --git a/src/gettext.h b/src/gettext.h
index cb3a141608036300ddd65781571748f365f05df2..b8d27f77ceb82a2b229ba8e01b24b4baf461a0cd 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -32,12 +32,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define gettext_noop(String) (String)
 #define N_(String) gettext_noop((String))
 
-#ifdef _MSC_VER
 void init_gettext(const char *path, const std::string &configured_language,
-               int argc, const char *argv[]);
-#else
-void init_gettext(const char *path, const std::string &configured_language);
-#endif
+       int argc, char *argv[]);
 
 extern wchar_t *utf8_to_wide_c(const char *str);
 

diff --git a/src/main.cpp b/src/main.cpp
index d5fcae2f79caeb7a55adc696289ae2768bc89b5f..1538c15d49271b8cd9dbe4df80c8a835d1b04d63 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -450,13 +450,8 @@ static bool init_common(const Settings &cmd_args, int argc, char *argv[])
        // Initialize HTTP fetcher
        httpfetch_init(g_settings->getS32("curl_parallel_limit"));
 
-#ifdef _MSC_VER
        init_gettext(porting::path_locale.c_str(),
                g_settings->get("language"), argc, argv);
-#else
-       init_gettext(porting::path_locale.c_str(),
-               g_settings->get("language"));
-#endif
 
        return true;
 }