aboutsummaryrefslogtreecommitdiff
path: root/arch/generic
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2020-09-03 17:58:17 -0400
committerRich Felker <dalias@aerifal.cx>2020-09-03 17:58:17 -0400
commit76f42fdf34b518ab4b1f0684209d3e1e60e92d9c (patch)
treea25254c27fe0df96eae1fc380498571aba295468 /arch/generic
parentb8b729bd22c28c9116c2fce65dce207a35299c26 (diff)
downloadmusl-76f42fdf34b518ab4b1f0684209d3e1e60e92d9c.tar.gz
musl-76f42fdf34b518ab4b1f0684209d3e1e60e92d9c.tar.xz
musl-76f42fdf34b518ab4b1f0684209d3e1e60e92d9c.zip
make generic bits/fcntl.h shareable with 64-bit archs
the fcntl file locking command macro values in the existing generic bits/fcntl.h were the "64" variants, requiring 64-bit archs that use the "plain" variants to have their own bits/fcntl.h, even if they otherwise use the common definitions for everything. since commit 7cc79d10afd43811a486fd5e9fcdf8e45ac599e0 exposed __LONG_MAX to all bits headers, we can now make the generic one common between 32- and 64-bit archs.
Diffstat (limited to 'arch/generic')
-rw-r--r--arch/generic/bits/fcntl.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/generic/bits/fcntl.h b/arch/generic/bits/fcntl.h
index ae233cc0..730a98cf 100644
--- a/arch/generic/bits/fcntl.h
+++ b/arch/generic/bits/fcntl.h
@@ -30,9 +30,15 @@
#define F_SETSIG 10
#define F_GETSIG 11
+#if __LONG_MAX == 0x7fffffffL
#define F_GETLK 12
#define F_SETLK 13
#define F_SETLKW 14
+#else
+#define F_GETLK 5
+#define F_SETLK 6
+#define F_SETLKW 7
+#endif
#define F_SETOWN_EX 15
#define F_GETOWN_EX 16