diff --git a/src/cmpt.c b/src/cmpt.c index 6726b7fc..499a0fe3 100644 --- a/src/cmpt.c +++ b/src/cmpt.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/connect.c b/src/connect.c index 361eb56b..2626ef32 100644 --- a/src/connect.c +++ b/src/connect.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/convert.c b/src/convert.c index 9f60ae3a..69d713f8 100644 --- a/src/convert.c +++ b/src/convert.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/cookies.c b/src/cookies.c index 1258472a..bdc32745 100644 --- a/src/cookies.c +++ b/src/cookies.c @@ -43,8 +43,6 @@ as that of the covered work. */ sites that do send Set-Cookie2 also emit Set-Cookie for compatibility. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/ftp-basic.c b/src/ftp-basic.c index 9145fe7d..38f0069f 100644 --- a/src/ftp-basic.c +++ b/src/ftp-basic.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/ftp-ls.c b/src/ftp-ls.c index 67e9bc51..e050c5a2 100644 --- a/src/ftp-ls.c +++ b/src/ftp-ls.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/ftp-opie.c b/src/ftp-opie.c index 5d740a1f..546e2105 100644 --- a/src/ftp-opie.c +++ b/src/ftp-opie.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/ftp.c b/src/ftp.c index 134c925a..645e565d 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/gen-md5.c b/src/gen-md5.c index d4d5f5c2..833f3f28 100644 --- a/src/gen-md5.c +++ b/src/gen-md5.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include "gen-md5.h" diff --git a/src/gnutls.c b/src/gnutls.c index 258c0156..57d4ad5c 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -27,8 +27,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/hash.c b/src/hash.c index f8b3c11f..4697b779 100644 --- a/src/hash.c +++ b/src/hash.c @@ -31,8 +31,6 @@ as that of the covered work. */ /* With -DSTANDALONE, this file can be compiled outside Wget source tree. To test, also use -DTEST. */ -#define USE_GNULIB_ALLOC - #ifndef STANDALONE # include "wget.h" #endif diff --git a/src/host.c b/src/host.c index 1b418ce3..5a530221 100644 --- a/src/host.c +++ b/src/host.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/html-parse.c b/src/html-parse.c index 623b7fd8..fdf5b99b 100644 --- a/src/html-parse.c +++ b/src/html-parse.c @@ -89,8 +89,6 @@ as that of the covered work. */ /* To test as standalone, compile with `-DSTANDALONE -I.'. You'll still need Wget headers to compile. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #ifdef STANDALONE diff --git a/src/html-url.c b/src/html-url.c index 717fe8c4..e9f2773a 100644 --- a/src/html-url.c +++ b/src/html-url.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/http-ntlm.c b/src/http-ntlm.c index 321d70d2..def832be 100644 --- a/src/http-ntlm.c +++ b/src/http-ntlm.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" /* NTLM details: diff --git a/src/http.c b/src/http.c index 84bbe2e0..c1049d8c 100644 --- a/src/http.c +++ b/src/http.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/init.c b/src/init.c index 1a5171ce..e079df95 100644 --- a/src/init.c +++ b/src/init.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/log.c b/src/log.c index 077ebeb8..f7b3dca8 100644 --- a/src/log.c +++ b/src/log.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/main.c b/src/main.c index 04ff76f3..b1e99695 100644 --- a/src/main.c +++ b/src/main.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/mswindows.c b/src/mswindows.c index c64da026..cdfea2d2 100644 --- a/src/mswindows.c +++ b/src/mswindows.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #define INHIBIT_WRAP /* avoid wrapping of socket, bind, ... */ #include "wget.h" diff --git a/src/netrc.c b/src/netrc.c index 35163a61..fea440d3 100644 --- a/src/netrc.c +++ b/src/netrc.c @@ -30,8 +30,6 @@ as that of the covered work. */ /* This file used to be kept in synch with the code in Fetchmail, but the latter has diverged since. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/openssl.c b/src/openssl.c index d35aba32..03fb1810 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -29,8 +29,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/progress.c b/src/progress.c index 62e8d87d..8b9b1013 100644 --- a/src/progress.c +++ b/src/progress.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/ptimer.c b/src/ptimer.c index 0f5b5db0..1e8c43c0 100644 --- a/src/ptimer.c +++ b/src/ptimer.c @@ -50,8 +50,6 @@ as that of the covered work. */ double secs = ptimer_measure (); printf ("The loop took %.2fs\n", secs); */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/recur.c b/src/recur.c index a992230d..d1d0f18d 100644 --- a/src/recur.c +++ b/src/recur.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/res.c b/src/res.c index 94d9769d..8c35f0e1 100644 --- a/src/res.c +++ b/src/res.c @@ -67,8 +67,6 @@ as that of the covered work. */ res_match_path, res_register_specs, res_get_specs, and res_retrieve_file. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/retr.c b/src/retr.c index 60d4c629..179430ac 100644 --- a/src/retr.c +++ b/src/retr.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/snprintf.c b/src/snprintf.c index 2a8fc6e6..f458981a 100644 --- a/src/snprintf.c +++ b/src/snprintf.c @@ -87,8 +87,6 @@ * **************************************************************/ -#define USE_GNULIB_ALLOC - #ifdef HAVE_CONFIG_H # include #endif diff --git a/src/spider.c b/src/spider.c index 70254093..08fefc9f 100644 --- a/src/spider.c +++ b/src/spider.c @@ -27,8 +27,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/test.c b/src/test.c index d6a86592..04658bc7 100644 --- a/src/test.c +++ b/src/test.c @@ -27,8 +27,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include #include "test.h" diff --git a/src/url.c b/src/url.c index 997b1058..a561725a 100644 --- a/src/url.c +++ b/src/url.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/utils.c b/src/utils.c index 3459be91..c4f78fe4 100644 --- a/src/utils.c +++ b/src/utils.c @@ -28,8 +28,6 @@ Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. */ -#define USE_GNULIB_ALLOC - #include "wget.h" #include diff --git a/src/utils.h b/src/utils.h index bac112ed..d3ae9b33 100644 --- a/src/utils.h +++ b/src/utils.h @@ -31,8 +31,6 @@ as that of the covered work. */ #ifndef UTILS_H #define UTILS_H -#ifdef USE_GNULIB_ALLOC - /* Constant is using when we don`t know attempted size exactly */ #define UNKNOWN_ATTEMPTED_SIZE -3 @@ -55,8 +53,6 @@ as that of the covered work. */ additional errors. (But we currently don't do that!) */ #define xfree_null(p) if (!(p)) ; else xfree (p) -#endif /* USE_GNULIB_ALLOC */ - struct hash_table; struct file_memory { diff --git a/src/wget.h b/src/wget.h index a0122db9..561e9cf9 100644 --- a/src/wget.h +++ b/src/wget.h @@ -208,12 +208,8 @@ typedef double SUM_SIZE_INT; #include "options.h" /* Everything uses this, so include them here directly. */ -#ifdef USE_GNULIB_ALLOC -# include -# include "xalloc.h" -#else -# include "xmalloc.h" -#endif +#include +#include "xalloc.h" /* Likewise for logging functions. */ #include "log.h"