remove ifdefs (a6dca9d2) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

src/tool_metalink.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -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 */

+2 −8

Original line number	Diff line number	Diff line
		@@ -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 "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