From: Abdelrazak Younes <younes@lyx.org>
Date: Sat, 21 Oct 2006 07:26:07 +0000 (+0000)
Subject: MSVC compilation fix.
X-Git-Tag: 1.6.10~12297
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5c0438b85c38c8475f129a75bcc06855cc5592e3;p=features.git

MSVC compilation fix.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15425 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/aspell.C b/src/aspell.C
index 78f677475c..f9caa75233 100644
--- a/src/aspell.C
+++ b/src/aspell.C
@@ -20,13 +20,9 @@
 
 #include <boost/assert.hpp>
 
-
-namespace lyx {
-
-using docstring;
-
 using std::string;
 
+namespace lyx {
 
 ASpell::ASpell(BufferParams const &, string const & lang)
 	: els(0), spell_error_object(0)
diff --git a/src/aspell_local.h b/src/aspell_local.h
index 7ad1994657..1b45c70451 100644
--- a/src/aspell_local.h
+++ b/src/aspell_local.h
@@ -13,18 +13,20 @@
 #ifndef LYX_ASPELL_H
 #define LYX_ASPELL_H
 
-#include <map>
-
 #include "SpellBase.h"
 
+#include "support/docstring.h"
+
+#include <map>
 
-namespace lyx {
 
 class AspellSpeller;
 class AspellStringEnumeration;
 class AspellCanHaveError;
 class AspellConfig;
 
+namespace lyx {
+
 class BufferParams;
 
 
diff --git a/src/lyxsocket.C b/src/lyxsocket.C
index 99758de0be..1a26070691 100644
--- a/src/lyxsocket.C
+++ b/src/lyxsocket.C
@@ -79,7 +79,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 +169,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 +208,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 +232,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 +266,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
diff --git a/src/support/kill.C b/src/support/kill.C
index 69913e6961..3d100969a7 100644
--- a/src/support/kill.C
+++ b/src/support/kill.C
@@ -38,7 +38,7 @@ int support::kill(int pid, int sig)
 		return -1;
 	}
 	if (!TerminateProcess(hProcess, sig)) {
-		lyxerr << "kill process failed!" << endl;
+		lyxerr << "kill process failed!" << std::endl;
 		CloseHandle(hProcess);
 		return -1;
 	}
diff --git a/src/support/tempname.C b/src/support/tempname.C
index 16909cd60c..6d44e42f67 100644
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -55,7 +55,7 @@ int make_tempfile(char * templ)
 	return ::mkstemp(templ);
 #elif defined(HAVE_MKTEMP)
 	// This probably just barely works...
-	::mktemp(templ);
+	mktemp(templ);
 # if defined (HAVE_OPEN)
 # if (!defined S_IRUSR)
 #   define S_IRUSR S_IREAD
@@ -63,7 +63,7 @@ int make_tempfile(char * templ)
 # endif
 	return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 # elif defined (HAVE__OPEN)
-	return ::_open(templ,
+	return _open(templ,
 		       _O_RDWR | _O_CREAT | _O_EXCL,
 		       _S_IREAD | _S_IWRITE);
 # else
@@ -99,7 +99,7 @@ string const lyx::support::tempName(string const & dir, string const & mask)
 	if (tmpf != -1) {
 		string const t(tmpl.get());
 #if defined (HAVE_CLOSE)
-		::close(tmpf);
+		close(tmpf);
 #elif defined (HAVE__CLOSE)
 		::_close(tmpf);
 #else