diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2015-01-21 22:04:35 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2015-01-21 22:04:35 +0100 |
| commit | befe7362ecf114c057355d8303bb9718b5133db2 (patch) | |
| tree | 160514dc56ad4dec200683ab500ba1b61e297c3e /misc | |
| parent | 89502430391de303d858423ec70670f2191daac9 (diff) | |
| parent | 5d8116626e131b26c25bce6173badfd78ce36786 (diff) | |
Merge remote-tracking branch 'refs/remotes/savannah/top-bases/tschwinge/Roger_Whittaker' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
Versions.def
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/chflags.c | 4 | ||||
| -rw-r--r-- | misc/fchflags.c | 4 | ||||
| -rw-r--r-- | misc/sys/file.h | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/misc/chflags.c b/misc/chflags.c index 3785c6b7b0..cf3b77fdf0 100644 --- a/misc/chflags.c +++ b/misc/chflags.c @@ -21,12 +21,12 @@ /* Change the flags of FILE to FLAGS. */ -int chflags (const char *file, int flags) __THROW; +int chflags (const char *file, unsigned long int flags) __THROW; int chflags (file, flags) const char *file; - int flags; + unsigned long int flags; { if (file == NULL) { diff --git a/misc/fchflags.c b/misc/fchflags.c index 53805eaf0e..1e61921aac 100644 --- a/misc/fchflags.c +++ b/misc/fchflags.c @@ -21,12 +21,12 @@ /* Change the flags of the file referenced by FD to FLAGS. */ -int fchflags (int fd, int flags) __THROW; +int fchflags (int fd, unsigned long int flags) __THROW; int fchflags (fd, flags) int fd; - int flags; + unsigned long int flags; { if (fd < 0) { diff --git a/misc/sys/file.h b/misc/sys/file.h index 64e8764c47..a5892db17c 100644 --- a/misc/sys/file.h +++ b/misc/sys/file.h @@ -40,6 +40,7 @@ __BEGIN_DECLS #define LOCK_SH 1 /* Shared lock. */ #define LOCK_EX 2 /* Exclusive lock. */ #define LOCK_UN 8 /* Unlock. */ +#define __LOCK_ATOMIC 16 /* Atomic update. */ /* Can be OR'd in to one of the above. */ #define LOCK_NB 4 /* Don't block when locking. */ |