Remove redundant guard.

diff --git a/src/ChangeLog b/src/ChangeLog
index eacf9a4a0d9239a9705ef14045bf5d7c0b0f19da..fb3d99447e25a83f84c364c9a4225ab5655e7599 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,25 @@
 2010-12-01  Giuseppe Scrivano  <gscrivano@gnu.org>
 
+       * cmpt.c: Include <unistd.h> 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  <vivi@mage.me.uk>

diff --git a/src/cmpt.c b/src/cmpt.c
index ac75b5dd68f66b6839c228ad696141984848b618..2fd2122829d626db26ca53ca8ae6790cf33cc33f 100644 (file)
--- a/src/cmpt.c
+++ b/src/cmpt.c
@@ -36,9 +36,7 @@ as that of the covered work.  */
 #include <string.h>
 #include <time.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include <errno.h>
 

diff --git a/src/connect.c b/src/connect.c
index 2922e88392a6fd584aee4dee27fef97fdfeebf45..44034ed8f1c78ab773da8ba11fc7b21881007004 100644 (file)
--- a/src/connect.c
+++ b/src/connect.c
@@ -32,9 +32,7 @@ as that of the covered work.  */
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <assert.h>
 
 #include <sys/socket.h>

diff --git a/src/convert.c b/src/convert.c
index 4efc27beb0b2dce759b1d66c5e06c3ee75aac2ee..92beaae828cfd403992662ba0adbd1dfaa7ab04b 100644 (file)
--- a/src/convert.c
+++ b/src/convert.c
@@ -33,9 +33,7 @@ as that of the covered work.  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 #include <assert.h>
 #include "convert.h"

diff --git a/src/ftp-basic.c b/src/ftp-basic.c
index 836f77e9c5f7dead390459c8ef9a6fdfd41aafe3..b2d21b1a1f086977d8d7c8e124c88f1d9b2d7139 100644 (file)
--- a/src/ftp-basic.c
+++ b/src/ftp-basic.c
@@ -36,9 +36,7 @@ as that of the covered work.  */
 #include <errno.h>
 
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include "utils.h"
 #include "connect.h"
 #include "host.h"

diff --git a/src/ftp-ls.c b/src/ftp-ls.c
index 8fb210644d7719a4af6383742ef435b0f1da7d0d..df26ebfb1c1100d6ce83d5898ab3070b7e86d6bc 100644 (file)
--- a/src/ftp-ls.c
+++ b/src/ftp-ls.c
@@ -33,9 +33,7 @@ as that of the covered work.  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <errno.h>
 #include <time.h>
 #include "utils.h"

diff --git a/src/ftp.c b/src/ftp.c
index 8dddeed89cba85e1d83db44562c3a9c208edf059..9e6160bd6494ae376635597c97cf417958824ba9 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -34,9 +34,7 @@ as that of the covered work.  */
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <assert.h>
 #include <errno.h>
 #include <time.h>

diff --git a/src/gnutls.c b/src/gnutls.c
index 1bf4aefdbfdb17251eb8955f74a28065d99aef90..5b730af1a3cc45b3ce16709c8c02a01a7713847b 100644 (file)
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -32,9 +32,7 @@ as that of the covered work.  */
 
 #include <assert.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <stdio.h>
 #include <dirent.h>

diff --git a/src/http.c b/src/http.c
index a0e41cac01791916e0561d2809c0928b22e1b47a..438b02188a3d4d589526add514f0bbb2a8b31948 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -33,9 +33,7 @@ as that of the covered work.  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <assert.h>
 #include <errno.h>
 #include <time.h>

diff --git a/src/init.c b/src/init.c
index 5559369d48ada3a571f54d3f1029c39b81f85538..5bc555d757152d74043955f214c1450e10ab6884 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -33,9 +33,7 @@ as that of the covered work.  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <errno.h>
 #include <limits.h>

diff --git a/src/log.c b/src/log.c
index 489702b1f547021d5ba927606612f7d35331b577..ce861e9d5c0b2be5a469b0b119ddf2fcfd24e1a4 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -34,9 +34,7 @@ as that of the covered work.  */
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <assert.h>
 #include <errno.h>
 

diff --git a/src/main.c b/src/main.c
index b576ba87405ede2a79622f35fa5957bd71baf69f..fe1d469d6a1d23b431dd7e664e786b2695a7e37f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -32,9 +32,7 @@ as that of the covered work.  */
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <string.h>
 #include <signal.h>
 #ifdef ENABLE_NLS

diff --git a/src/openssl.c b/src/openssl.c
index 4be81cb2db2d4cdfcefb73f8b3507863c3b6ef35..0376614d0650aa95a6a65abcb98b9eaa7a18264b 100644 (file)
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -33,9 +33,7 @@ as that of the covered work.  */
 
 #include <assert.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 
 #include <openssl/ssl.h>

diff --git a/src/progress.c b/src/progress.c
index 8f43c1ce8a9120b8eddc1fb2cddf560e4ff31571..7a9aeae8f799e5658946884d51d2c9a7a5964e04 100644 (file)
--- a/src/progress.c
+++ b/src/progress.c
@@ -34,9 +34,7 @@ as that of the covered work.  */
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <signal.h>
 #ifdef HAVE_WCHAR_H
 # include <wchar.h>

diff --git a/src/ptimer.c b/src/ptimer.c
index 72f561e50912cbcd5e6da586cf62e1e0ed442d15..156306e27bcdfd925a326aad094c5f05bacc6e39 100644 (file)
--- a/src/ptimer.c
+++ b/src/ptimer.c
@@ -57,9 +57,7 @@ as that of the covered work.  */
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <time.h>
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/src/recur.c b/src/recur.c
index fbdb5cefdf2c6e1675e2dc20cf610ae3d82efe54..90af5c64350ed0edadf186ba7d6e6d86e024409a 100644 (file)
--- a/src/recur.c
+++ b/src/recur.c
@@ -33,9 +33,7 @@ as that of the covered work.  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 #include <assert.h>
 

diff --git a/src/retr.c b/src/retr.c
index 5dc3cc8d660f0692a2ccd52635aa3125d40d4d7d..16b6df7b662be413e1d72c7d38bf382939a8fee9 100644 (file)
--- a/src/retr.c
+++ b/src/retr.c
@@ -32,9 +32,7 @@ as that of the covered work.  */
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <assert.h>

diff --git a/src/url.c b/src/url.c
index 8be9c8d821e4c99d6ed3a6971deb48394a3d127e..daa6d991b6fb7f21de661cd726c1448fbd448223 100644 (file)
--- a/src/url.c
+++ b/src/url.c
@@ -33,9 +33,7 @@ as that of the covered work.  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <errno.h>
 #include <assert.h>
 

diff --git a/src/utils.c b/src/utils.c
index d7683075dc3e352cb0d1729f691d3cb0a2d78777..bc64186adf66137c277a20012a7bd00d514447f7 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -37,9 +37,7 @@ as that of the covered work.  */
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #ifdef HAVE_MMAP
 # include <sys/mman.h>
 #endif