diff options
author | Yang Tse <yangsita@gmail.com> | 2012-04-06 23:35:15 +0200 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2012-04-06 23:37:05 +0200 |
commit | 919c97fa65a5c00f7044e849eeb0095408413505 (patch) | |
tree | 12b5005946b744b178cf1fecd310941074cffa45 /lib/easy.c | |
parent | 376b4d48feea9da98eda15ddf05c86729d9dc3f1 (diff) | |
download | curl-919c97fa65a5c00f7044e849eeb0095408413505.tar.gz |
curl tool: use configuration files from lib directory
Configuration files such as curl_config.h and all config-*.h no longer exist
nor are generated/copied into 'src' directory, now these only exist in 'lib'
directory from where curl tool sources uses them.
Additionally old src/setup.h has been refactored into src/tool_setup.h which
now pulls lib/setup.h
The possibility of a makefile needing an include path adjustment exists.
Diffstat (limited to 'lib/easy.c')
-rw-r--r-- | lib/easy.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/easy.c b/lib/easy.c index 60a55edf8..6e8ff770a 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -66,6 +66,7 @@ #include "curl_ntlm.h" #include "connect.h" /* for Curl_getconnectinfo */ #include "slist.h" +#include "amigaos.h" #include "curl_rand.h" #include "non-ascii.h" #include "warnless.h" @@ -238,8 +239,8 @@ CURLcode curl_global_init(long flags) } #ifdef __AMIGA__ - if(!amiga_init()) { - DEBUGF(fprintf(stderr, "Error: amiga_init failed\n")); + if(!Curl_amiga_init()) { + DEBUGF(fprintf(stderr, "Error: Curl_amiga_init failed\n")); return CURLE_FAILED_INIT; } #endif @@ -328,9 +329,7 @@ void curl_global_cleanup(void) if(init_flags & CURL_GLOBAL_WIN32) win32_cleanup(); -#ifdef __AMIGA__ - amiga_cleanup(); -#endif + Curl_amiga_cleanup(); #if defined(USE_LIBSSH2) && defined(HAVE_LIBSSH2_EXIT) (void)libssh2_exit(); |