From 2d207afe8e12f00b5a1276a678e2402c3c4c7961 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 24 Oct 2015 13:31:42 -0400 Subject: Fix compilation under MSVC and remove unnecessary conditional function prototype Thanks to SmallJoker for pointing this out. --- src/gettext.cpp | 6 +----- src/gettext.h | 6 +----- src/main.cpp | 5 ----- 3 files changed, 2 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/gettext.cpp b/src/gettext.cpp index 26b16f434..1fab875e5 100644 --- 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 cb3a14160..b8d27f77c 100644 --- 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 d5fcae2f7..1538c15d4 100644 --- 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; } -- cgit v1.2.3 >
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2015-01-04 05:10:07 +0100
committerKahrl <kahrl@gmx.net>2015-01-04 05:21:59 +0100
commit060ae29eafbca089824cfbcedc9bc36b7fda5d5e (patch)
tree47af0760a13c5c8dd1129de39461518eb46034e9
parent3c3887bb198c07b50ad3451f228aadfe6fd25168 (diff)
Update bundled SQLite to 3.8.7.4
Diffstat
-rw-r--r--src/sqlite/sqlite3.c68764
-rw-r--r--src/sqlite/sqlite3.h1440
2 files changed, 47153 insertions, 23051 deletions
diff --git a/src/sqlite/sqlite3.c b/src/sqlite/sqlite3.c
index 2c426c21e..81e9c733c 100644
--- a/src/sqlite/sqlite3.c
+++ b/src/sqlite/sqlite3.c