diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2013-02-14 11:41:57 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-02-14 11:41:57 +0100 |
| commit | a6dca9d28c5f12b3f1933b43bb30f1235dee03d4 (patch) | |
| tree | d33d25253381e14cae5f8d10f8dafdff565cb48e | |
| parent | 358c5c0745a4c47f910189095f3832163b4708c4 (diff) | |
remove ifdefs
Clarify the code by reducing ifdefs
| -rw-r--r-- | src/tool_metalink.h | 3 | ||||
| -rw-r--r-- | src/tool_operhlp.c | 10 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/tool_metalink.h b/src/tool_metalink.h index 0a69c459e..2f66e6a45 100644 --- a/src/tool_metalink.h +++ b/src/tool_metalink.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2013, 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 @@ -155,6 +155,7 @@ void metalink_cleanup(void); #define count_next_metalink_resource(x) 0 #define clean_metalink(x) Curl_nop_stmt +#define metalink_cleanup(x) Curl_nop_stmt #endif /* USE_METALINK */ diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c index 9078b9564..631488727 100644 --- a/src/tool_operhlp.c +++ b/src/tool_operhlp.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2013, 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 @@ -31,11 +31,7 @@ #include "tool_convert.h" #include "tool_operhlp.h" #include "tool_version.h" - -#ifdef USE_METALINK -/* import the declaration of metalink_cleanup() */ -# include "tool_metalink.h" -#endif +#include "tool_metalink.h" #include "memdebug.h" /* keep this as LAST include */ @@ -220,9 +216,7 @@ void main_free(void) { curl_global_cleanup(); convert_cleanup(); -#ifdef USE_METALINK metalink_cleanup(); -#endif } #ifdef CURLDEBUG |