generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove ifdefs

Browse Source 
Clarify the code by reducing ifdefs
This commit is contained in:
Daniel Stenberg 2013-02-14 11:41:57 +01:00
parent 358c5c0745
commit a6dca9d28c
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tool_metalink.h
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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 count_next_metalink_resource(x) 0
#define clean_metalink(x) Curl_nop_stmt #define clean_metalink(x) Curl_nop_stmt
#define metalink_cleanup(x) Curl_nop_stmt
#endif /* USE_METALINK */ #endif /* USE_METALINK */

10
src/tool_operhlp.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -31,11 +31,7 @@
#include "tool_convert.h" #include "tool_convert.h"
#include "tool_operhlp.h" #include "tool_operhlp.h"
#include "tool_version.h" #include "tool_version.h"
#include "tool_metalink.h"
#ifdef USE_METALINK
/* import the declaration of metalink_cleanup() */
# include "tool_metalink.h"
#endif
#include "memdebug.h" /* keep this as LAST include */ #include "memdebug.h" /* keep this as LAST include */
@ -220,9 +216,7 @@ void main_free(void)
{ {
curl_global_cleanup(); curl_global_cleanup();
convert_cleanup(); convert_cleanup();
#ifdef USE_METALINK
metalink_cleanup(); metalink_cleanup();
#endif
} }
#ifdef CURLDEBUG #ifdef CURLDEBUG