anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

put back the :: global namespace identifiers.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15431 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-10-21 08:30:58 +00:00
parent 3df82b3c25
commit 3a0cbc2be7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lyxsocket.C
View File

@ -78,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);
}
@ -168,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
@ -207,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);
@ -231,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);
}
@ -265,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

8
src/support/tempname.C
View File

@ -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,11 +99,11 @@ 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
# error No close() function.
# error No x() function.
#endif
lyxerr[Debug::FILES] << "Temporary file `" << t
<< "' created." << endl;