From a0b207164c6c943adb8b3bf89b375a491b41806a Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Fri, 14 Dec 2012 17:38:18 +0100
Subject: setup_once.h: refactor inclusion of <unistd.h> and <sys/socket.h>

Inclusion of top two most included header files now done in setup_once.h
---
 src/tool_cb_rea.c   | 4 ----
 src/tool_cb_see.c   | 4 ----
 src/tool_dirhie.c   | 4 ----
 src/tool_getpass.c  | 4 ----
 src/tool_homedir.c  | 3 ---
 src/tool_main.c     | 4 ----
 src/tool_metalink.c | 4 ----
 src/tool_operate.c  | 4 ----
 src/tool_sleep.c    | 4 ----
 9 files changed, 35 deletions(-)

(limited to 'src')

diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c
index 5320cdb30..4565a15d6 100644
--- a/src/tool_cb_rea.c
+++ b/src/tool_cb_rea.c
@@ -21,10 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c
index af33ad40b..2f49e1d96 100644
--- a/src/tool_cb_see.c
+++ b/src/tool_cb_see.c
@@ -21,10 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c
index d21dc97c6..4ba1c4375 100644
--- a/src/tool_dirhie.c
+++ b/src/tool_dirhie.c
@@ -23,10 +23,6 @@
 
 #include <sys/stat.h>
 
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
 #ifdef WIN32
 #  include <direct.h>
 #endif
diff --git a/src/tool_getpass.c b/src/tool_getpass.c
index a3fffa9b3..0ac7dcbe0 100644
--- a/src/tool_getpass.c
+++ b/src/tool_getpass.c
@@ -24,10 +24,6 @@
 #ifndef HAVE_GETPASS_R
 /* this file is only for systems without getpass_r() */
 
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
 #ifdef HAVE_FCNTL_H
 #  include <fcntl.h>
 #endif
diff --git a/src/tool_homedir.c b/src/tool_homedir.c
index 61cc02afb..cb90095e5 100644
--- a/src/tool_homedir.c
+++ b/src/tool_homedir.c
@@ -24,9 +24,6 @@
 #ifdef HAVE_PWD_H
 #  include <pwd.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
 #ifdef __VMS
 #  include <unixlib.h>
 #endif
diff --git a/src/tool_main.c b/src/tool_main.c
index be1b3fcaa..9c0a19f3f 100644
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -23,10 +23,6 @@
 
 #include <sys/stat.h>
 
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
diff --git a/src/tool_metalink.c b/src/tool_metalink.c
index 42b514ca3..f9e9869b2 100644
--- a/src/tool_metalink.c
+++ b/src/tool_metalink.c
@@ -23,10 +23,6 @@
 
 #ifdef USE_METALINK
 
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
 #include <sys/stat.h>
 
 #ifdef HAVE_FCNTL_H
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 826b4a5da..bcbce2000 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -21,10 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
 #ifdef HAVE_FCNTL_H
 #  include <fcntl.h>
 #endif
diff --git a/src/tool_sleep.c b/src/tool_sleep.c
index 835484025..49cdc71b8 100644
--- a/src/tool_sleep.c
+++ b/src/tool_sleep.c
@@ -25,10 +25,6 @@
 #  include <sys/select.h>
 #endif
 
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
 #ifdef HAVE_SYS_POLL_H
 #  include <sys/poll.h>
 #elif defined(HAVE_POLL_H)
-- 
cgit v1.2.3