X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxsocket.C;h=0de947676401945c424931c139dfea79178b6e3b;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=1a260706913b0d47bf869fb30710b343751df150;hpb=5c0438b85c38c8475f129a75bcc06855cc5592e3;p=lyx.git

diff --git a/src/lyxsocket.C b/src/lyxsocket.C
index 1a26070691..0de9476764 100644
--- a/src/lyxsocket.C
+++ b/src/lyxsocket.C
@@ -31,9 +31,6 @@
 
 #include <cerrno>
 
-
-namespace lyx {
-
 #if defined (_WIN32)
 # include <io.h>
 #endif
@@ -45,6 +42,8 @@ using std::endl;
 using std::string;
 
 
+namespace lyx {
+
 // Address is the unix address for the socket.
 // MAX_CLIENTS is the maximum number of clients
 // that can connect at the same time.
@@ -79,7 +78,7 @@ LyXServerSocket::~LyXServerSocket()
 {
 	if (fd_ != -1) {
 		theApp->unregisterSocketCallback(fd_);
-		if (close(fd_) != 0)
+		if (::close(fd_) != 0)
 			lyxerr << "lyx: Server socket " << fd_
 			       << " IO error on closing: " << strerror(errno);
 	}
@@ -169,7 +168,7 @@ void LyXServerSocket::writeln(string const & line)
 {
 	string const linen(line + '\n');
 	int const size = linen.size();
-	int const written = write(fd_, linen.c_str(), size);
+	int const written = ::write(fd_, linen.c_str(), size);
 	if (written < size) { // Always mean end of connection.
 		if ((written == -1) && (errno == EPIPE)) {
 			// The program will also receive a SIGPIPE
@@ -208,7 +207,7 @@ LyXDataSocket::LyXDataSocket(int fd)
 
 LyXDataSocket::~LyXDataSocket()
 {
-	if (close(fd_) != 0)
+	if (::close(fd_) != 0)
 		lyxerr << "lyx: Data socket " << fd_
 		       << " IO error on closing: " << strerror(errno);
 
@@ -232,7 +231,7 @@ bool LyXDataSocket::readln(string & line)
 	int count;
 
 	// read and store characters in buffer
-	while ((count = read(fd_, charbuf, charbuf_size - 1)) > 0) {
+	while ((count = ::read(fd_, charbuf, charbuf_size - 1)) > 0) {
 		buffer_.append(charbuf, charbuf + count);
 	}
 
@@ -266,7 +265,7 @@ void LyXDataSocket::writeln(string const & line)
 {
 	string const linen(line + '\n');
 	int const size = linen.size();
-	int const written = write(fd_, linen.c_str(), size);
+	int const written = ::write(fd_, linen.c_str(), size);
 	if (written < size) { // Always mean end of connection.
 		if ((written == -1) && (errno == EPIPE)) {
 			// The program will also receive a SIGPIPE