Commit 1bfd750f authored by Tatsuhiro Tsujikawa's avatar Tatsuhiro Tsujikawa Committed by Daniel Stenberg
Browse files

Reduced #ifdef HAVE_METALINK

parent 7bdb9fba

src/Makefile-metalink.inc

deleted100644 → 0
+0 −1
Original line number Original line Diff line number Diff line 
curl_SOURCES += tool_metalink.c tool_metalink.h

src/Makefile.am

+0 −3
Original line number Original line Diff line number Diff line
@@ -50,9 +50,6 @@ AM_CPPFLAGS = -DCURL_STATICLIB 
endif

endif





include Makefile.inc

include Makefile.inc

if HAVE_LIBMETALINK

include Makefile-metalink.inc

endif # HAVE_LIBMETALINK





# This might hold -Werror

# This might hold -Werror

CFLAGS += @CURL_CFLAG_EXTRAS@ @LIBMETALINK_CFLAGS@

CFLAGS += @CURL_CFLAG_EXTRAS@ @LIBMETALINK_CFLAGS@

src/Makefile.inc

+4 −2
Original line number Original line Diff line number Diff line
@@ -50,7 +50,8 @@ CURL_CFILES = hugehelp.c \ 
	tool_vms.c \

	tool_vms.c \

	tool_writeenv.c \

	tool_writeenv.c \

	tool_writeout.c \

	tool_writeout.c \

	tool_xattr.c

	tool_xattr.c \

	tool_metalink.c





CURL_HFILES = hugehelp.h \

CURL_HFILES = hugehelp.h \

	tool_binmode.h \

	tool_binmode.h \
@@ -91,7 +92,8 @@ CURL_HFILES = hugehelp.h \ 
	tool_vms.h \

	tool_vms.h \

	tool_writeenv.h \

	tool_writeenv.h \

	tool_writeout.h \

	tool_writeout.h \

	tool_xattr.h

	tool_xattr.h \

	tool_metalink.h





curl_SOURCES = $(CURL_CFILES) $(CURLX_ONES) $(CURL_HFILES)

curl_SOURCES = $(CURL_CFILES) $(CURLX_ONES) $(CURL_HFILES)

src/tool_cfgable.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -25,9 +25,7 @@ 




#include "tool_sdecls.h"

#include "tool_sdecls.h"





#ifdef HAVE_LIBMETALINK

#include "tool_metalink.h"

#include "tool_metalink.h"

#endif /* HAVE_LIBMETALINK */





struct Configurable {

struct Configurable {

  CURL *easy;               /* once we have one, we keep it here */

  CURL *easy;               /* once we have one, we keep it here */
@@ -202,10 +200,9 @@ struct Configurable { 
  bool xattr;               /* store metadata in extended attributes */

  bool xattr;               /* store metadata in extended attributes */

  long gssapi_delegation;

  long gssapi_delegation;

  bool ssl_allow_beast;     /* allow this SSL vulnerability */

  bool ssl_allow_beast;     /* allow this SSL vulnerability */

#ifdef HAVE_LIBMETALINK



  metalinkfile *metalinkfile_list; /* point to the first node */

  metalinkfile *metalinkfile_list; /* point to the first node */

  metalinkfile *metalinkfile_last; /* point to the last/current node */

  metalinkfile *metalinkfile_last; /* point to the last/current node */

#endif /* HAVE_LIBMETALINK */

}; /* struct Configurable */

}; /* struct Configurable */





void free_config_fields(struct Configurable *config);

void free_config_fields(struct Configurable *config);

src/tool_getparam.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -43,10 +43,7 @@ 
#include "tool_paramhlp.h"

#include "tool_paramhlp.h"

#include "tool_parsecfg.h"

#include "tool_parsecfg.h"

#include "tool_version.h"

#include "tool_version.h"



#ifdef HAVE_LIBMETALINK

#include "tool_metalink.h"

#include "tool_metalink.h"

#endif /* HAVE_LIBMETALINK */





#include "memdebug.h" /* keep this as LAST include */

#include "memdebug.h" /* keep this as LAST include */