Mercurial > mplayer.hg

changeset 27481:03c589c49c6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove Windows-specific #ifdefs, the file does not compile on MinGW anyway.
author diego
date Mon, 01 Sep 2008 22:34:27 +0000
parents d9a7ed452979
children 88c54359eb69
files libvo/vo_bl.c
diffstat 1 files changed, 2 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_bl.c	Mon Sep 01 22:27:24 2008 +0000
+++ b/libvo/vo_bl.c	Mon Sep 01 22:34:27 2008 +0000
@@ -34,13 +34,9 @@
 
 #include "config.h"
 
-#ifndef HAVE_WINSOCK2_H
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#else
-#include <winsock2.h>
-#endif
 
 #include "video_out.h"
 #include "video_out_internal.h"
@@ -48,10 +44,6 @@
 #include "m_option.h"
 #include "fastmemcpy.h"
 
-#ifndef HAVE_CLOSESOCKET
-#define closesocket close
-#endif
-
 static const vo_info_t info = 
 {
 	"Blinkenlights driver: http://www.blinkenlights.de",
@@ -190,7 +182,7 @@
 	if (connect(h->fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
 		mp_msg(MSGT_VO, MSGL_ERR, "couldn't connect socket for %s\n", 
 				h->name);
-		closesocket(h->fd);
+		close(h->fd);
 		return 1;
 	}
 	return 0;
@@ -202,7 +194,7 @@
 }
 
 static void udp_close(bl_host_t *h) {
-	closesocket(h->fd);
+	close(h->fd);
 }
 
 #define NO_BLS 3