vbox的更動 37597 路徑 trunk/src/VBox/Runtime/r3/darwin

時間撮記:

2011-6-22 下午08:54:05 (13 年 以前)

作者:

vboxsync

訊息:

darwin build fix

檔案:

• trunk/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp (修改) (7 筆差異)

trunk/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -50 +50 @@
 
 
-RTR3DECL(int)  RTFileLock(RTFILE File, unsigned fLock, int64_t offLock, uint64_t cbLock)
+RTR3DECL(int)  RTFileLock(RTFILE hFile, unsigned fLock, int64_t offLock, uint64_t cbLock)
 {
     Assert(offLock >= 0);
@@ -83 +83 @@
 
     Assert(RTFILE_LOCK_WAIT);
-    if (fcntl(File, (fLock & RTFILE_LOCK_WAIT) ? F_SETLKW : F_SETLK, &fl) >= 0)
+    if (fcntl(RTFileToNative(hFile), (fLock & RTFILE_LOCK_WAIT) ? F_SETLKW : F_SETLK, &fl) >= 0)
         return VINF_SUCCESS;
     int iErr = errno;
@@ -102 +102 @@
         else
             f |= LOCK_SH;
-        if (!flock(File, f))
+        if (!flock(RTFileToNative(hFile), f))
             return VINF_SUCCESS;
         iErr = errno;
@@ -117 +117 @@
 
 
-RTR3DECL(int)  RTFileChangeLock(RTFILE File, unsigned fLock, int64_t offLock, uint64_t cbLock)
+RTR3DECL(int)  RTFileChangeLock(RTFILE hFile, unsigned fLock, int64_t offLock, uint64_t cbLock)
 {
     /** @todo We never returns VERR_FILE_NOT_LOCKED for now. */
-    return RTFileLock(File, fLock, offLock, cbLock);
+    return RTFileLock(hFile, fLock, offLock, cbLock);
 }
 
 
-RTR3DECL(int)  RTFileUnlock(RTFILE File, int64_t offLock, uint64_t cbLock)
+RTR3DECL(int)  RTFileUnlock(RTFILE hFile, int64_t offLock, uint64_t cbLock)
 {
     Assert(offLock >= 0);
@@ -148 +148 @@
     fl.l_pid    = 0;
 
-    if (fcntl(File, F_SETLK, &fl) >= 0)
+    if (fcntl(RTFileToNative(hFile), F_SETLK, &fl) >= 0)
         return VINF_SUCCESS;
 
@@ -155 +155 @@
     {
         /* A SMB hack, see RTFileLock. */
-        if (!flock(File, LOCK_UN))
+        if (!flock(RTFileToNative(hFile), LOCK_UN))
             return VINF_SUCCESS;
     }