Undo the USE_GNULIB_ALLOC defines.

diff --git a/src/cmpt.c b/src/cmpt.c
index 6726b7fc4ee46e210a6375088925d011e2a0619f..499a0fe3644a7b942631c47739b50433c562c5f7 100644 (file)
--- 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 <stdio.h>

diff --git a/src/connect.c b/src/connect.c
index 361eb56b787291f4d84038270cfe3c79ba42ce75..2626ef3208dee2fe7054ba61db79b8d743370327 100644 (file)
--- 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 <stdio.h>

diff --git a/src/convert.c b/src/convert.c
index 9f60ae3a0b75f8e0e52d3234e1e3873dc0e644ed..69d713f812d1d68e31cb343d936f876bcf512c0d 100644 (file)
--- 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 <stdio.h>

diff --git a/src/cookies.c b/src/cookies.c
index 1258472a13d1d6f02226e4030db417978a2c7668..bdc32745b9e2afeaefdfe2010793eb0ba6b7b199 100644 (file)
--- 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 <stdio.h>

diff --git a/src/ftp-basic.c b/src/ftp-basic.c
index 9145fe7d5c662ab379c9c613008eea1ec14cb9a6..38f0069fa394637e58b990b33ea54add4785be74 100644 (file)
--- 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 <assert.h>

diff --git a/src/ftp-ls.c b/src/ftp-ls.c
index 67e9bc513f6a73567de05b691f60d485904a723b..e050c5a25460a5444a032e0eaa83a6f1daff8f02 100644 (file)
--- 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 <stdio.h>

diff --git a/src/ftp-opie.c b/src/ftp-opie.c
index 5d740a1f9d509845b60a176d32132b2f2a25826a..546e2105d36a1c1572903f9805c477965d23d3aa 100644 (file)
--- 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 <stdio.h>

diff --git a/src/ftp.c b/src/ftp.c
index 134c925aebfe2ea9350b57b69ef22d7ff3851e0a..645e565d8584a5f2394c4752d9f35a249b7ea092 100644 (file)
--- 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 <stdio.h>

diff --git a/src/gen-md5.c b/src/gen-md5.c
index d4d5f5c2267ed86f14d5d76120f4e9ad03fdf454..833f3f28278e5a0e7a59dce891f5915d2f26ea0e 100644 (file)
--- 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 258c0156b133e82079053f2b725b4b7938d06900..57d4ad5c5dca739673df569f3adbc3ccf63fd68e 100644 (file)
--- 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 <assert.h>

diff --git a/src/hash.c b/src/hash.c
index f8b3c11faa4242d463c2ddef7d35fb5988b6872f..4697b779bf65ef1ba4ec99de4d8ff0d122e342d3 100644 (file)
--- 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 1b418ce3a677cd3bba254398dbcec4f944dbb497..5a530221da17969cdd17ba42cbc86a305e699771 100644 (file)
--- 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 <stdio.h>

diff --git a/src/html-parse.c b/src/html-parse.c
index 623b7fd8260f37719191ff073f8a0f07c07becf6..fdf5b99bc791c8c420633be631903b8ab3f1be64 100644 (file)
--- 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 717fe8c4daef79a3929b8bf1272b6ed62b3574f7..e9f2773ab409eeabb49966fcc9f7a8e6fede8a39 100644 (file)
--- 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 <stdio.h>

diff --git a/src/http-ntlm.c b/src/http-ntlm.c
index 321d70d2144517801aacace614cb05d2ce4abe64..def832be9bc6975b9e73f4bc85237c5924dce8fb 100644 (file)
--- 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 84bbe2e0dc1df16813e2b441e31b6942211f05d4..c1049d8ce776bf7add63c8b1a66bc05e4c3841b7 100644 (file)
--- 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 <stdio.h>

diff --git a/src/init.c b/src/init.c
index 1a5171ce89299e6b6d640c0cbfc297908f16ea8b..e079df95d12d1b2ac4afd24fb98df1a035260a51 100644 (file)
--- 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 <stdio.h>

diff --git a/src/log.c b/src/log.c
index 077ebeb833847afe7b9cbcdca0bb0c1f2a7e2ce7..f7b3dca86086d3e2e5b9e843c50e308cc9569f6d 100644 (file)
--- 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 <stdio.h>

diff --git a/src/main.c b/src/main.c
index 04ff76f372d6eb7182c216ad08e3027b5536dc74..b1e99695f19f124bc45af691a145be5b9324bc98 100644 (file)
--- 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 <stdio.h>

diff --git a/src/mswindows.c b/src/mswindows.c
index c64da02699c4e7ec508bd85cc29e6886f578b4a3..cdfea2d263390012a1a3ced53d7e47f6aa4e2064 100644 (file)
--- 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 35163a61e9070b5d2cd879fb05a4ea11a465545c..fea440d33eb60f7b1ac2a729d5136f3f9a72fbee 100644 (file)
--- 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 <stdio.h>

diff --git a/src/openssl.c b/src/openssl.c
index d35aba32502102740c9e7e9918a472101e082848..03fb1810172b61b1ad4572cb0c05a65e6f7a7952 100644 (file)
--- 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 <assert.h>

diff --git a/src/progress.c b/src/progress.c
index 62e8d87dad544453e2d9b3b37b6c7da600ced6a1..8b9b1013a255668de285219819bbefc088a118e7 100644 (file)
--- 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 <stdio.h>

diff --git a/src/ptimer.c b/src/ptimer.c
index 0f5b5db0c8d3309bbc09eadd790446ef0b5ec1a7..1e8c43c04e9fed6e1f6bf5801aabc7681ff553fb 100644 (file)
--- 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 <stdio.h>

diff --git a/src/recur.c b/src/recur.c
index a992230dd1e91fee00229e67b34f613f71fbce17..d1d0f18d2e08094b04ea5f8680f95cbee0ecf75d 100644 (file)
--- 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 <stdio.h>

diff --git a/src/res.c b/src/res.c
index 94d9769ddabeb7d53f5878de71f4a8dc3ff1ebba..8c35f0e1cfae726a877e23e12b4ac44256d940ff 100644 (file)
--- 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 <stdio.h>

diff --git a/src/retr.c b/src/retr.c
index 60d4c62969bc53cd74bc58068f80b74f4d0e13d8..179430acf72b83454fa319e1f987ddc320860303 100644 (file)
--- 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 <stdio.h>

diff --git a/src/snprintf.c b/src/snprintf.c
index 2a8fc6e64dddf57024923341cded1bc99da69145..f458981af8f65f0726a4d7e0d29133c0216b6509 100644 (file)
--- a/src/snprintf.c
+++ b/src/snprintf.c
@@ -87,8 +87,6 @@
  *
  **************************************************************/
 
-#define USE_GNULIB_ALLOC
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

diff --git a/src/spider.c b/src/spider.c
index 702540934b706d04d787a26289babcba329df1b3..08fefc9f353cb698a3321871dfe10f3a28322f40 100644 (file)
--- 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 <stdio.h>

diff --git a/src/test.c b/src/test.c
index d6a865921dc5284ab7c9b47aff6441f30f25b835..04658bc75e79a49ca5a2c359c16f361dcbcaf34a 100644 (file)
--- 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 <stdio.h>
 
 #include "test.h"

diff --git a/src/url.c b/src/url.c
index 997b1058c111a726fb21923bf562ee28fc3c548a..a561725a200db5bebc75d5284bdbdb21130c7ff9 100644 (file)
--- 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 <stdio.h>

diff --git a/src/utils.c b/src/utils.c
index 3459be913ee38e53c8db1342a26214dbd02448e0..c4f78fe4b766c05b8b1def56b22650ff8bfb0737 100644 (file)
--- 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 <stdio.h>

diff --git a/src/utils.h b/src/utils.h
index bac112ed713d3e6cd7ffb2dd53f994550df35a25..d3ae9b33f11c75a61dfeb3de1cf8686a3bfb0f9c 100644 (file)
--- 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 a0122db9cc2043e7006c62ce7c9e1756229f857a..561e9cf917e53d15faad983a4c2b9a90b7cf0b54 100644 (file)
--- 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 <alloca.h>
-# include "xalloc.h"
-#else
-# include "xmalloc.h"
-#endif
+#include <alloca.h>
+#include "xalloc.h"
 
 /* Likewise for logging functions.  */
 #include "log.h"