diff --git a/libretroshare/src/pqi/rstcpsocket.cc b/libretroshare/src/pqi/rstcpsocket.cc
index 8f77a993b..ac91414b3 100644
--- a/libretroshare/src/pqi/rstcpsocket.cc
+++ b/libretroshare/src/pqi/rstcpsocket.cc
@@ -61,14 +61,7 @@ bool RsTcpSocket::connect()
     }
     mState = CONNECTED;
 
-#ifndef WINDOWS_SYS
-    int flags = fcntl(CreateSocket,F_GETFL);
-    fcntl(CreateSocket, F_SETFL, flags | O_NONBLOCK);
-#else
-    unsigned long int on = 1;
-    ret = ioctlsocket(fd, FIONBIO, &on);
-#endif
-
+    unix_fcntl_nonblock(CreateSocket);
     setSocket(CreateSocket);
 
     return true;
diff --git a/libretroshare/src/tor/TorManager.cpp b/libretroshare/src/tor/TorManager.cpp
index 9d84910ce..c4e2d8789 100644
--- a/libretroshare/src/tor/TorManager.cpp
+++ b/libretroshare/src/tor/TorManager.cpp
@@ -175,14 +175,7 @@ static bool test_listening_port(const std::string& /*address*/,uint16_t port)
        close(sockfd);
        return false;
     }
-#ifndef WINDOWS_SYS
-    int flags = fcntl(sockfd, F_GETFL);
-    fcntl(sockfd, F_SETFL, flags | O_NONBLOCK);
-#else
-    unsigned long int on = 1;
-    ret = ioctlsocket(fd, FIONBIO, &on);
-#endif
-
+    unix_fcntl_nonblock(sockfd);
     int res = listen(sockfd,5);
 
     int err = errno;
diff --git a/libretroshare/src/tor/TorProcess.cpp b/libretroshare/src/tor/TorProcess.cpp
index 8ae8721db..92a4958e9 100644
--- a/libretroshare/src/tor/TorProcess.cpp
+++ b/libretroshare/src/tor/TorProcess.cpp
@@ -272,14 +272,9 @@ void TorProcess::start()
     }
 
     int flags ;
-#ifndef WINDOWS_SYS
-    flags = fcntl(fd[STDOUT_FILENO], F_GETFL); fcntl(fd[STDOUT_FILENO], F_SETFL, flags | O_NONBLOCK);
-    flags = fcntl(fd[STDERR_FILENO], F_GETFL); fcntl(fd[STDERR_FILENO], F_SETFL, flags | O_NONBLOCK);
-#else
-    unsigned long int on = 1;
-    ret = ioctlsocket(fd[STDOUT_FILENO], FIONBIO, &on);
-    ret = ioctlsocket(fd[STDERR_FILENO], FIONBIO, &on);
-#endif
+    unix_fcntl_nonblock(fd[STDOUT_FILENO]);
+    unix_fcntl_nonblock(fd[STDERR_FILENO]);
+
     mStdOutFD = new RsFdBinInterface(fd[STDOUT_FILENO]);
     mStdErrFD = new RsFdBinInterface(fd[STDERR_FILENO]);
 }