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
---
 tests/server/fake_ntlm.c | 4 ----
 tests/server/resolve.c   | 9 ---------
 tests/server/rtspd.c     | 6 ------
 tests/server/sockfilt.c  | 6 ------
 tests/server/sws.c       | 6 ------
 tests/server/tftpd.c     | 7 +------
 tests/server/util.c      | 6 ------
 7 files changed, 1 insertion(+), 43 deletions(-)

(limited to 'tests/server')

diff --git a/tests/server/fake_ntlm.c b/tests/server/fake_ntlm.c
index 4af334d6e..64f0675e7 100644
--- a/tests/server/fake_ntlm.c
+++ b/tests/server/fake_ntlm.c
@@ -29,10 +29,6 @@
  * responses with a pre-written string saved in test case test2005.
  */
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #define ENABLE_CURLX_PRINTF
 #include "curlx.h" /* from the private lib dir */
 #include "getpart.h"
diff --git a/tests/server/resolve.c b/tests/server/resolve.c
index 323758973..d0609888a 100644
--- a/tests/server/resolve.c
+++ b/tests/server/resolve.c
@@ -34,15 +34,6 @@
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index e68c60943..3c55eff35 100644
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -30,12 +30,6 @@
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index e04cd3356..7a397687d 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -83,12 +83,6 @@
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 291027481..44d899fd7 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -31,12 +31,6 @@
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index 62c95e65d..e8c3c2d82 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -58,9 +58,6 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -81,9 +78,7 @@
 #endif
 
 #include <setjmp.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
diff --git a/tests/server/util.c b/tests/server/util.c
index c6a404bbb..30766d80f 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -24,12 +24,6 @@
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-- 
cgit v1.2.3