Skip to content

MacOS now has working OFD locks #2603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mwinkel-dev merged 1 commit into from
Aug 25, 2023
Merged

MacOS now has working OFD locks #2603

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions treeshr/RemoteAccess.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#include <mdsplus/mdsconfig.h>
#include <mdsplus/mdsplus.h>
#ifdef _WIN32
#include <winsock2.h>
#include <windows.h>
Expand All @@ -39,11 +40,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// # define flock lx_flock
// # include <linux/fcntl.h>
// # undef flock

#ifndef F_OFD_SETLK
#ifdef _MACOSX
// Open File Descriptor (OFD) locks have existed as a private / undocumented
// feature in MacOS releases since 2015. For more details, refer to the
// comments at the end of Issue #2599 and the earlier PRs #2163 and #2198.
#define F_OFD_GETLK 92
#define F_OFD_SETLK 90
#define F_OFD_SETLKW 91
#else
// The usual defines for Linux
#define F_OFD_GETLK 36
#define F_OFD_SETLK 37
#define F_OFD_SETLKW 38
#endif
#endif

#endif
#include <ctype.h>
#include <errno.h>
Expand Down