Undo the USE_GNULIB_ALLOC defines.

2024-12-28 22:00:27 +08:00 · 2008-04-20 11:46:52 +02:00 · 2008-04-20 11:46:52 +02:00 · 2c77220411
commit 2c77220411
parent 2957ce1cbc
34 changed files with 2 additions and 74 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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
--- 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>
--- 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
--- 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>
--- 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:
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- a/src/snprintf.c
+++ b/src/snprintf.c
@ -87,8 +87,6 @@
 *
 **************************************************************/

-#define USE_GNULIB_ALLOC
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
--- 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>
--- 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"
--- 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>
--- 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>
--- 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 {
--- 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"