From 9ae052b1e294644f8f4ed3aa5f809fc341d9d4f2 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 1 Dec 2010 13:15:13 +0100 Subject: [PATCH] Remove redundant guard. --- src/ChangeLog | 20 ++++++++++++++++++++ src/cmpt.c | 4 +--- src/connect.c | 4 +--- src/convert.c | 4 +--- src/ftp-basic.c | 4 +--- src/ftp-ls.c | 4 +--- src/ftp.c | 4 +--- src/gnutls.c | 4 +--- src/http.c | 4 +--- src/init.c | 4 +--- src/log.c | 4 +--- src/main.c | 4 +--- src/openssl.c | 4 +--- src/progress.c | 4 +--- src/ptimer.c | 4 +--- src/recur.c | 4 +--- src/retr.c | 4 +--- src/url.c | 4 +--- src/utils.c | 4 +--- 19 files changed, 38 insertions(+), 54 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index eacf9a4a..fb3d9944 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,25 @@ 2010-12-01 Giuseppe Scrivano + * cmpt.c: Include inconditionally. + * connect.c: Likewise. + * convert.c: Likewise. + * ftp-basic.c: Likewise. + * ftp-ls.c: Likewise. + * ftp.c: Likewise. + * gnutls.c: Likewise. + * http.c: Likewise. + * init.c: Likewise. + * log.c: Likewise. + * main.c: Likewise. + * openssl.c: Likewise. + * progress.c: Likewise. + * ptimer.c: Likewise. + * recur.c: Likewise. + * retr.c: Likewise. + * url.c: Likewise. + * utils.c: Likewise. + + * retr.c (fd_read_body): Dinamically allocate `dlbuf'. 2010-11-27 Reza Snowdon diff --git a/src/cmpt.c b/src/cmpt.c index ac75b5dd..2fd21228 100644 --- a/src/cmpt.c +++ b/src/cmpt.c @@ -36,9 +36,7 @@ as that of the covered work. */ #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include diff --git a/src/connect.c b/src/connect.c index 2922e883..44034ed8 100644 --- a/src/connect.c +++ b/src/connect.c @@ -32,9 +32,7 @@ as that of the covered work. */ #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include #include diff --git a/src/convert.c b/src/convert.c index 4efc27be..92beaae8 100644 --- a/src/convert.c +++ b/src/convert.c @@ -33,9 +33,7 @@ as that of the covered work. */ #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif /* HAVE_UNISTD_H */ +#include #include #include #include "convert.h" diff --git a/src/ftp-basic.c b/src/ftp-basic.c index 836f77e9..b2d21b1a 100644 --- a/src/ftp-basic.c +++ b/src/ftp-basic.c @@ -36,9 +36,7 @@ as that of the covered work. */ #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include "utils.h" #include "connect.h" #include "host.h" diff --git a/src/ftp-ls.c b/src/ftp-ls.c index 8fb21064..df26ebfb 100644 --- a/src/ftp-ls.c +++ b/src/ftp-ls.c @@ -33,9 +33,7 @@ as that of the covered work. */ #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include #include #include "utils.h" diff --git a/src/ftp.c b/src/ftp.c index 8dddeed8..9e6160bd 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -34,9 +34,7 @@ as that of the covered work. */ #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include #include #include diff --git a/src/gnutls.c b/src/gnutls.c index 1bf4aefd..5b730af1 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -32,9 +32,7 @@ as that of the covered work. */ #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include #include #include diff --git a/src/http.c b/src/http.c index a0e41cac..438b0218 100644 --- a/src/http.c +++ b/src/http.c @@ -33,9 +33,7 @@ as that of the covered work. */ #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include #include #include diff --git a/src/init.c b/src/init.c index 5559369d..5bc555d7 100644 --- a/src/init.c +++ b/src/init.c @@ -33,9 +33,7 @@ as that of the covered work. */ #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include #include #include diff --git a/src/log.c b/src/log.c index 489702b1..ce861e9d 100644 --- a/src/log.c +++ b/src/log.c @@ -34,9 +34,7 @@ as that of the covered work. */ #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include #include diff --git a/src/main.c b/src/main.c index b576ba87..fe1d469d 100644 --- a/src/main.c +++ b/src/main.c @@ -32,9 +32,7 @@ as that of the covered work. */ #include #include -#ifdef HAVE_UNISTD_H -# include -#endif /* HAVE_UNISTD_H */ +#include #include #include #ifdef ENABLE_NLS diff --git a/src/openssl.c b/src/openssl.c index 4be81cb2..0376614d 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -33,9 +33,7 @@ as that of the covered work. */ #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include #include diff --git a/src/progress.c b/src/progress.c index 8f43c1ce..7a9aeae8 100644 --- a/src/progress.c +++ b/src/progress.c @@ -34,9 +34,7 @@ as that of the covered work. */ #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include #ifdef HAVE_WCHAR_H # include diff --git a/src/ptimer.c b/src/ptimer.c index 72f561e5..156306e2 100644 --- a/src/ptimer.c +++ b/src/ptimer.c @@ -57,9 +57,7 @@ as that of the covered work. */ #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include #ifdef HAVE_SYS_TIME_H # include diff --git a/src/recur.c b/src/recur.c index fbdb5cef..90af5c64 100644 --- a/src/recur.c +++ b/src/recur.c @@ -33,9 +33,7 @@ as that of the covered work. */ #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif /* HAVE_UNISTD_H */ +#include #include #include diff --git a/src/retr.c b/src/retr.c index 5dc3cc8d..16b6df7b 100644 --- a/src/retr.c +++ b/src/retr.c @@ -32,9 +32,7 @@ as that of the covered work. */ #include #include -#ifdef HAVE_UNISTD_H -# include -#endif /* HAVE_UNISTD_H */ +#include #include #include #include diff --git a/src/url.c b/src/url.c index 8be9c8d8..daa6d991 100644 --- a/src/url.c +++ b/src/url.c @@ -33,9 +33,7 @@ as that of the covered work. */ #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include #include #include diff --git a/src/utils.c b/src/utils.c index d7683075..bc64186a 100644 --- a/src/utils.c +++ b/src/utils.c @@ -37,9 +37,7 @@ as that of the covered work. */ #ifdef HAVE_SYS_TIME_H # include #endif -#ifdef HAVE_UNISTD_H -# include -#endif +#include #ifdef HAVE_MMAP # include #endif -- 2.39.2