From 32bfdf048e4704d1c0d5cf0ab9c79ff2866259af Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 20 Oct 2008 21:34:08 +0200 Subject: [PATCH] Removed unneeded socket includes + minor reformat --- src/client.c | 10 ---------- src/connection.c | 13 +------------ src/logic.c | 9 --------- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/src/client.c b/src/client.c index 3c46784..43adcad 100644 --- a/src/client.c +++ b/src/client.c @@ -34,12 +34,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_UNISTD_H #include #endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif #include #include #include @@ -65,10 +59,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -#if HAVE_NETINET_IN_H -#include -#endif - #include "pazpar2.h" #include "client.h" diff --git a/src/connection.c b/src/connection.c index 3db2f9a..c93e182 100644 --- a/src/connection.c +++ b/src/connection.c @@ -34,16 +34,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_UNISTD_H #include #endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#ifdef WIN32 -#include -typedef int socklen_t; -#endif -#if HAVE_NETDB_H -#include -#endif #include #include @@ -95,8 +85,7 @@ static int connection_is_idle(struct connection *co) if (!ZOOM_connection_is_idle(link)) return 0; event = ZOOM_connection_peek_event(link); - if (event == ZOOM_EVENT_NONE || - event == ZOOM_EVENT_END) + if (event == ZOOM_EVENT_NONE || event == ZOOM_EVENT_END) return 1; else return 0; diff --git a/src/logic.c b/src/logic.c index 167c2ae..98a56a3 100644 --- a/src/logic.c +++ b/src/logic.c @@ -34,12 +34,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_UNISTD_H #include #endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif #include #include #include @@ -63,9 +57,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -#if HAVE_NETINET_IN_H -#include -#endif #include "pazpar2.h" #include "eventl.h" -- 1.7.10.4