diff options
| author | Brian Behlendorf <[email protected]> | 2011-02-20 14:02:48 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-02-23 14:32:15 -0800 |
| commit | 5a52a782a0a04efee3846e1a8f0bb4796930e0e4 (patch) | |
| tree | 65506a546397fc90a4af6508433e29ca142351d6 | |
| parent | 914b063133365a17b1f607cbe96102259e497753 (diff) | |
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.
| -rw-r--r-- | include/sys/fcntl.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/sys/fcntl.h b/include/sys/fcntl.h index c7bc02a6e..4e260a4b8 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 */ |