Fix compilation under MSVC and remove unnecessary conditional function prototype
Thanks to SmallJoker for pointing this out.master
parent
127b9aed09
commit
2d207afe8e
|
@ -117,12 +117,8 @@ const char* MSVC_LocaleLookup(const char* raw_shortname) {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
#ifdef _MSC_VER
|
|
||||||
void init_gettext(const char *path, const std::string &configured_language,
|
void init_gettext(const char *path, const std::string &configured_language,
|
||||||
int argc, const char *argv[])
|
int argc, char *argv[])
|
||||||
#else
|
|
||||||
void init_gettext(const char *path, const std::string &configured_language)
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
#if USE_GETTEXT
|
#if USE_GETTEXT
|
||||||
// First, try to set user override environment
|
// First, try to set user override environment
|
||||||
|
|
|
@ -32,12 +32,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#define gettext_noop(String) (String)
|
#define gettext_noop(String) (String)
|
||||||
#define N_(String) gettext_noop((String))
|
#define N_(String) gettext_noop((String))
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
void init_gettext(const char *path, const std::string &configured_language,
|
void init_gettext(const char *path, const std::string &configured_language,
|
||||||
int argc, const char *argv[]);
|
int argc, char *argv[]);
|
||||||
#else
|
|
||||||
void init_gettext(const char *path, const std::string &configured_language);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern wchar_t *utf8_to_wide_c(const char *str);
|
extern wchar_t *utf8_to_wide_c(const char *str);
|
||||||
|
|
||||||
|
|
|
@ -450,13 +450,8 @@ static bool init_common(const Settings &cmd_args, int argc, char *argv[])
|
||||||
// Initialize HTTP fetcher
|
// Initialize HTTP fetcher
|
||||||
httpfetch_init(g_settings->getS32("curl_parallel_limit"));
|
httpfetch_init(g_settings->getS32("curl_parallel_limit"));
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
init_gettext(porting::path_locale.c_str(),
|
init_gettext(porting::path_locale.c_str(),
|
||||||
g_settings->get("language"), argc, argv);
|
g_settings->get("language"), argc, argv);
|
||||||
#else
|
|
||||||
init_gettext(porting::path_locale.c_str(),
|
|
||||||
g_settings->get("language"));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue