kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'file-LOCK-close' into release

This commit is contained in:
Brad King 2015-03-25 09:01:32 -04:00
parent 732d8a467a 1f289095f9
commit dc311f5f9d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmFileLockUnix.cxx
View File

@ -15,6 +15,7 @@
#include <errno.h> // errno #include <errno.h> // errno
#include <stdio.h> // SEEK_SET #include <stdio.h> // SEEK_SET
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h>
#include "cmSystemTools.h" #include "cmSystemTools.h"
cmFileLock::cmFileLock(): File(-1) cmFileLock::cmFileLock(): File(-1)
@ -31,6 +32,9 @@ cmFileLockResult cmFileLock::Release()
this->Filename = ""; this->Filename = "";
::close(this->File);
this->File = -1;
if (lockResult == 0) if (lockResult == 0)
{ {
return cmFileLockResult::MakeOk(); return cmFileLockResult::MakeOk();

3
Source/cmFileLockWin32.cxx
View File

@ -38,6 +38,9 @@ cmFileLockResult cmFileLock::Release()
this->Filename = ""; this->Filename = "";
CloseHandle(this->File);
this->File = INVALID_HANDLE_VALUE;
if (unlockResult) if (unlockResult)
{ {
return cmFileLockResult::MakeOk(); return cmFileLockResult::MakeOk();