From 5a52a782a0a04efee3846e1a8f0bb4796930e0e4 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Sun, 20 Feb 2011 14:02:48 -0800 Subject: [PATCH] Use Linux flock struct Rather than defining our own structure which will conflict with Linux's version when building 32-bit. Simply setup a typedef to always use the correct Linux version for both 32 ad 64-bit builds. --- include/sys/fcntl.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/include/sys/fcntl.h b/include/sys/fcntl.h index c7bc02a6e7..4e260a4b8d 100644 --- a/include/sys/fcntl.h +++ b/include/sys/fcntl.h @@ -28,12 +28,10 @@ #define F_FREESP 11 -typedef struct flock64 { - short l_type; - short l_whence; - loff_t l_start; - loff_t l_len; - pid_t l_pid; -} flock64_t; +#ifdef CONFIG_64BIT +typedef struct flock flock64_t; +#else +typedef struct flock64 flock64_t; +#endif /* CONFIG_64BIT */ #endif /* _SPL_FCNTL_H */