On 18 Aug 2016 08:03, Jeff Layton wrote: > +2016-08-18 Jeff Layton <jlayton@xxxxxxxxxx> > + * sysdeps/unix/sysv/linux/bits/fcntl-linux.h: > + Add F_OFD_GETLK32, F_OFD_SETLK32, F_OFD_SETLKW32 Should be a blank line after the first one. look at all the other entries in this file as an example. > --- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h > +++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h > @@ -127,11 +127,20 @@ > This means that they are inherited across fork or clone with CLONE_FILES > like BSD (flock) locks, and they are only released automatically when the > last reference to the the file description against which they were acquired > - is put. */ > + is put. */ > #ifdef __USE_GNU > -# define F_OFD_GETLK 36 > -# define F_OFD_SETLK 37 > -# define F_OFD_SETLKW 38 > +# if __OFF_T_MATCHES_OFF64_T || defined __USE_FILE_OFFSET64 > +# define F_OFD_GETLK 36 > +# define F_OFD_SETLK 37 > +# define F_OFD_SETLKW 38 > +# else > +# define F_OFD_GETLK32 39 > +# define F_OFD_SETLK32 40 > +# define F_OFD_SETLKW32 41 > +# define F_OFD_GETLK F_OFD_GETLK32 > +# define F_OFD_SETLK F_OFD_SETLK32 > +# define F_OFD_SETLKW F_OFD_SETLKW32 > +# endif > #endif i think we should define *64 and *32 variants all the time, and then route the F_OFD_GETLK/etc... to them based on compile mode. -mike
Attachment:
signature.asc
Description: Digital signature
