diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-06-16 11:59:34 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-06-16 11:59:34 +0000 |
| commit | aaa2ecaa6fd16fa6a03e1c9051b0a481e8d4f20a (patch) | |
| tree | 230b5f6a71d1e4d09c22d70ae6b314cd8a5723cc /src/main.cc | |
| parent | 06644332c2cc5b229ef41857ceed73f7caf2775f (diff) | |
2008-06-16 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Applied Ross's aria2-0.13.2+1-mingw-4.patch. In this commit,
only the
follow sources are applied.
* src/Platform.h: I removed HAVE_WINSOCK2_H directive from
Platform.h.
* src/Platform.cc: Moved common setup/teardown code to Platform
class.
I moved #endif // HAVE_WINSOCK2_H to the front of #include
"DlAbortEx.h"
I included locale.h from Platform.cc.
* src/main.cc: Moved common setup/teardown code to Platform
class.
* test/AllTest.cc: Use Platform class.
Set locale to C in AllTest.cc to prevent the messages to be
localized.
Diffstat (limited to 'src/main.cc')
| -rw-r--r-- | src/main.cc | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/main.cc b/src/main.cc index d16bdf72..0be2f133 100644 --- a/src/main.cc +++ b/src/main.cc @@ -85,15 +85,6 @@ extern char* optarg; extern int optind, opterr, optopt; #include <getopt.h> -#ifdef HAVE_LIBSSL -// for SSL -# include <openssl/err.h> -# include <openssl/ssl.h> -#endif // HAVE_LIBSSL -#ifdef HAVE_LIBGNUTLS -# include <gnutls/gnutls.h> -#endif // HAVE_LIBGNUTLS - namespace aria2 { // output stream to /dev/null @@ -460,31 +451,9 @@ int main(int argc, char* argv[]) } // namespace aria2 int main(int argc, char* argv[]) { -#ifdef HAVE_WINSOCK2_H aria2::Platform platform; -#endif // HAVE_WINSOCK2_H - -#ifdef ENABLE_NLS - setlocale (LC_CTYPE, ""); - setlocale (LC_MESSAGES, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); -#endif // ENABLE_NLS - -#ifdef HAVE_LIBSSL - // for SSL initialization - SSL_load_error_strings(); - SSL_library_init(); -#endif // HAVE_LIBSSL -#ifdef HAVE_LIBGNUTLS - gnutls_global_init(); -#endif // HAVE_LIBGNUTLS int r = aria2::main(argc, argv); -#ifdef HAVE_LIBGNUTLS - gnutls_global_deinit(); -#endif // HAVE_LIBGNUTLS - return r; } |