Index: socket.cpp
===================================================================
--- socket.cpp	(revision 28)
+++ socket.cpp	(working copy)
@@ -1,5 +1,7 @@
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <stdio.h>
 
-
 #ifdef WIN32
 	#include <Winsock2.h>
 	typedef SOCKET SOCKET_T;
@@ -152,14 +154,23 @@
 
 void Socket::setBlocking(bool doBlock)
 {
+   int flags;
+   int r;
+	
+   flags = fcntl (_sock->s, F_GETFL);
+
 	if( doBlock )
 	{
 		u_long iMode = 0;	// blocking
-		int r = ioctlsocket(_sock->s, FIONBIO, &iMode);
+		//int r = ioctlsocket(_sock->s, FIONBIO, &iMode);
+		//int r = fcntl(_sock->s, F_SETFL, &iMode) ;
+      		r = fcntl (_sock->s, F_SETFL, flags & ~O_NONBLOCK);	
 	} else {
 		//set client to non-blocking mode: (is server is non-blocking, so will the clients be)
 		u_long iMode = 1;	// non-blocking
-		int r = ioctlsocket(_sock->s, FIONBIO, &iMode);
+		//int r = ioctlsocket(_sock->s, FIONBIO, &iMode);
+		//int r = fcntl(_sock->s, F_SETFL, &iMode) ;
+      		r = fcntl (_sock->s, F_SETFL, flags | O_NONBLOCK);	
 	}
 	//return r==0;	//return True if no error.
 }
Index: taglib/taglib/taglib_export.h
===================================================================
--- taglib/taglib/taglib_export.h	(revision 28)
+++ taglib/taglib/taglib_export.h	(working copy)
@@ -26,17 +26,14 @@
 #ifndef TAGLIB_EXPORT_H
 #define TAGLIB_EXPORT_H
 
-
-/*
-#if (defined(_WIN32) || defined(_WIN64)) && (!defined(MAKE_TAGLIB_STATIC))
-	#ifdef MAKE_TAGLIB_LIB
-		#define TAGLIB_EXPORT __declspec(dllexport)
-	#else
-		#define TAGLIB_EXPORT __declspec(dllimport)
-	#endif
+#if defined(_WIN32) || defined(_WIN64)
+#ifdef MAKE_TAGLIB_LIB
+#define TAGLIB_EXPORT __declspec(dllexport)
 #else
-*/
-	#define TAGLIB_EXPORT
-//#endif
+#define TAGLIB_EXPORT __declspec(dllimport)
+#endif
+#else
+#define TAGLIB_EXPORT
+#endif
 
 #endif