aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2013-12-13 18:08:53 +0100
committerKahrl <kahrl@gmx.net>2013-12-13 18:08:53 +0100
commite275b7099a68e32aac102bb9e4a9125b1dccf91c (patch)
tree1777b2d843e8087f70dbe9d0b726578d5d777f55
parent0d990bd189881a9a6c829e1c9ec17b2dc5ac12c8 (diff)
downloadminetest-e275b7099a68e32aac102bb9e4a9125b1dccf91c.tar.gz
minetest-e275b7099a68e32aac102bb9e4a9125b1dccf91c.tar.bz2
minetest-e275b7099a68e32aac102bb9e4a9125b1dccf91c.zip
Don't call curl_global_init twice
-rw-r--r--src/main.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 239d68246..480e885c2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -86,10 +86,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "database-leveldb.h"
#endif
-#if USE_CURL
-#include "curl/curl.h"
-#endif
-
/*
Settings.
These are loaded from the config file.
@@ -997,11 +993,6 @@ int main(int argc, char *argv[])
srand(time(0));
mysrand(time(0));
-#if USE_CURL
- CURLcode res = curl_global_init(CURL_GLOBAL_DEFAULT);
- assert(res == CURLE_OK);
-#endif
-
// Initialize HTTP fetcher
httpfetch_init(g_settings->getS32("curl_parallel_limit"));