* fhandler_disk_file.cc (fhandler_disk_file::fchown): Fix typo in

comment.
	* mount.cc (mount_info::from_fstab): Use tmp_pathbuf rather than
	stack for big local buffer.
	* net.cc (cygwin_gethostname): Call GetComputerNameExA rather than
	GetComputerNameA if gethostname failed.
	* shared.cc (user_info::initialize): Fix formatting.
	* include/sys/file.h: Define flock and accompanying macros if not
	already defined in sys/_default_fcntl.h.
This commit is contained in:
Corinna Vinschen
2014-02-06 20:38:35 +00:00
parent 46913a8290
commit abbe1f5320
6 changed files with 36 additions and 11 deletions

View File

@ -31,4 +31,16 @@
#define L_INCR SEEK_CUR
#define L_XTND SEEK_END
/* Including <sys/file.h> always defines flock & macros. */
#if __BSD_VISIBLE - 0 == 0
#define LOCK_SH 0x01 /* shared file lock */
#define LOCK_EX 0x02 /* exclusive file lock */
#define LOCK_NB 0x04 /* don't block when locking */
#define LOCK_UN 0x08 /* unlock file */
extern int flock _PARAMS ((int, int));
#endif
#endif