From f421f1bb88f20536b2af3d4c357de5293725c1ff Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on ChromeOS)" <rob@synchro.net>
Date: Thu, 5 Dec 2024 17:42:15 -0800
Subject: [PATCH] In Boland's io.h, this function is just called locking()
---
src/xpdev/filewrap.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/xpdev/filewrap.c b/src/xpdev/filewrap.c
index db64271a90..09034a9b22 100644
--- a/src/xpdev/filewrap.c
+++ b/src/xpdev/filewrap.c
@@ -257,7 +257,7 @@ int unlock(int file, off_t offset, off_t size)
pos=tell(file);
if(offset!=pos)
(void)lseek(file, offset, SEEK_SET);
- i=_locking(file,LK_UNLCK,(long)size);
+ i = locking(file,LK_UNLCK,(long)size);
if(offset!=pos)
(void)lseek(file, pos, SEEK_SET);
return(i);
@@ -412,7 +412,7 @@ FILE *_fsopen(const char *pszFilename, const char *pszMode, int shmode)
#endif
#ifdef _WIN32
-#include <sys/locking.h> /* _locking */
+#include <sys/locking.h> /* LK_LOCK */
int xp_lockfile(int file, off_t offset, off_t size, bool block)
{
int i;
@@ -422,7 +422,7 @@ int xp_lockfile(int file, off_t offset, off_t size, bool block)
if(offset!=pos)
(void)lseek(file, offset, SEEK_SET);
do {
- i = _locking(file, block ? LK_LOCK : LK_NBLCK, (long)size);
+ i = locking(file, block ? LK_LOCK : LK_NBLCK, (long)size);
} while(block && i != 0 && errno == EDEADLOCK);
if(offset!=pos)
(void)lseek(file, pos, SEEK_SET);
--
GitLab