summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-10-01 08:19:55 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-10-01 08:19:55 +0000
commit6d1f7fb3d12fbebfb4c7bfc75d8c0ee5383d5c25 (patch)
tree048e7a6c526af907cb1cf12afacc363b3fac11ec
parent31443396f8d177df67c8fa75878277e6323ed6b7 (diff)
CWS-TOOLING: integrate CWS cloph11
-rw-r--r--shell/source/unix/sysshell/recently_used_file.cxx10
1 files changed, 1 insertions, 9 deletions
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index 8d00485324..9763ea8417 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: recently_used_file.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.30.1 $
*
* This file is part of OpenOffice.org.
*
@@ -91,11 +91,7 @@ recently_used_file::recently_used_file() :
if (NULL == file_)
throw "I/O error opening ~/.recently-used";
-#if defined(MACOSX) && (BUILD_OS_MINOR == 2)
- if (flock(fileno(file_),(LOCK_EX | LOCK_NB)) != 0)
-#else
if (lockf(fileno(file_), F_LOCK, 0) != 0)
-#endif
{
fclose(file_);
throw "Cannot lock ~/.recently-used";
@@ -108,11 +104,7 @@ recently_used_file::recently_used_file() :
//------------------------------------------------
recently_used_file::~recently_used_file()
{
-#if defined(MACOSX) && (BUILD_OS_MINOR == 2)
- flock(fileno(file_),LOCK_UN);
-#else
lockf(fileno(file_), F_ULOCK, 0);
-#endif
fclose(file_);
}