From 84e037631da0cf7e3d7099c566a181a2d506ed4c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 5 Oct 2010 20:37:18 +0200
Subject: output/httpd: use the new server_socket library

---
 src/output/httpd_internal.h | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'src/output/httpd_internal.h')

diff --git a/src/output/httpd_internal.h b/src/output/httpd_internal.h
index 14a5cf350..fee72c07f 100644
--- a/src/output/httpd_internal.h
+++ b/src/output/httpd_internal.h
@@ -29,12 +29,6 @@
 
 #include <glib.h>
 
-#ifdef WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <sys/socket.h>
-#endif
 #include <stdbool.h>
 
 struct httpd_client;
@@ -64,16 +58,6 @@ struct httpd_output {
 	 */
 	const char *content_type;
 
-	/**
-	 * The configured address of the listener socket.
-	 */
-	struct sockaddr_storage address;
-
-	/**
-	 * The size of #address.
-	 */
-	socklen_t address_size;
-
 	/**
 	 * This mutex protects the listener socket and the client
 	 * list.
@@ -89,12 +73,7 @@ struct httpd_output {
 	/**
 	 * The listener socket.
 	 */
-	int fd;
-
-	/**
-	 * A GLib main loop source id for the listener socket.
-	 */
-	guint source_id;
+	struct server_socket *server_socket;
 
 	/**
 	 * The header page, which is sent to every client on connect.
-- 
cgit v1.2.3