Changeset 1089 in kBuild

Timestamp:

Sep 5, 2007 8:50:59 PM (17 years ago)

Author:

bird

Message:

flock is BSD, use flock on Solaris.

File:

• trunk/src/kObjCache/kObjCache.c (modified) (2 diffs)

trunk/src/kObjCache/kObjCache.c

@@ -3370 +3370 @@
     if (!LockFileEx((HANDLE)_get_osfhandle(pCache->fd), LOCKFILE_EXCLUSIVE_LOCK, 0, ~0, 0, &OverLapped))
         FatalDie("Failed to lock the cache file: Windows Error %d\n", GetLastError());
+#elif defined(__sun__)
+    {
+        struct flock fl;
+        fl.l_whence = 0;
+        fl.l_start = 0;
+        fl.l_len = 0;
+        fl.l_type = F_WRLCK;
+        if (fcntl(pCache->fd, F_SETLKW, &fl) != 0)
+            FatalDie("Failed to lock the cache file: %s\n", strerror(errno));
+    }
 #else
     if (flock(pCache->fd, LOCK_EX) != 0)
@@ -3426 +3436 @@
     if (!UnlockFileEx((HANDLE)_get_osfhandle(pCache->fd), 0, ~0U, 0, &OverLapped))
         FatalDie("Failed to unlock the cache file: Windows Error %d\n", GetLastError());
+#elif defined(__sun__)
+    {
+        struct flock fl;
+        fl.l_whence = 0;
+        fl.l_start = 0;
+        fl.l_len = 0;
+        fl.l_type = F_UNLCK;
+        if (fcntl(pCache->fd, F_SETLKW, &fl) != 0)
+            FatalDie("Failed to lock the cache file: %s\n", strerror(errno));
+    }
 #else
     if (flock(pCache->fd, LOCK_UN) != 0)