From: Dan Dennedy <dan@dennedy.org>
Date: Sun, 17 Apr 2011 20:02:59 +0000 (-0700)
Subject: Fix melted on OS X.
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=d718bb3ffae348dae7bfc9807de6943b43cd42fa;p=melted

Fix melted on OS X.
---

diff --git a/configure b/configure
index 9b8e569..f486cde 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=0.3.10
+export version=0.3.11
 export soversion=2
 
 show_help()
diff --git a/src/melted/melted_server.c b/src/melted/melted_server.c
index 567acfd..48c34e8 100644
--- a/src/melted/melted_server.c
+++ b/src/melted/melted_server.c
@@ -228,7 +228,9 @@ int melted_server_execute( melted_server server )
 		return -1;
 	}
 
+#ifndef __DARWIN__
 	fcntl( server->socket, F_SETFL, O_NONBLOCK );
+#endif
 
 	if ( !server->proxy )
 	{