diff options
| author | kib <kib@FreeBSD.org> | 2014-07-15 10:05:52 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2014-07-15 10:05:52 +0000 |
| commit | caf3a68af9e698f30a28e37e9851180c4efeda89 (patch) | |
| tree | e222144d994f2bfd91ba2109c45c7f50a9729df3 /tools/regression | |
| parent | c2d1e1826f9feaeba0f558a9d1c318886772547a (diff) | |
| download | FreeBSD-src-caf3a68af9e698f30a28e37e9851180c4efeda89.zip FreeBSD-src-caf3a68af9e698f30a28e37e9851180c4efeda89.tar.gz | |
MFC r268385:
Make this compilable on latest Linux'es without warnings.
Diffstat (limited to 'tools/regression')
| -rw-r--r-- | tools/regression/file/flock/flock.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/regression/file/flock/flock.c b/tools/regression/file/flock/flock.c index c411853..fd426b0 100644 --- a/tools/regression/file/flock/flock.c +++ b/tools/regression/file/flock/flock.c @@ -27,6 +27,7 @@ * $FreeBSD$ */ +#include <sys/file.h> #include <sys/time.h> #ifdef __FreeBSD__ #include <sys/mount.h> @@ -39,6 +40,7 @@ #include <fcntl.h> #include <pthread.h> #include <signal.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -51,9 +53,13 @@ #include <sys/cdefs.h> #else #ifndef __unused +#ifdef __GNUC__ +#define __unused __attribute__((__unused__)) +#else #define __unused #endif #endif +#endif int verbose = 0; @@ -1329,7 +1335,6 @@ test15(int fd, __unused int argc, const __unused char **argv) */ int pid; int pfd[2]; - int fd2; struct flock fl; char ch; int res; @@ -1366,7 +1371,7 @@ test15(int fd, __unused int argc, const __unused char **argv) if (read(pfd[0], &ch, 1) != 1) err(1, "reading from pipe (child)"); - fd2 = dup(fd); + (void)dup(fd); if (flock(fd, LOCK_SH) < 0) err(1, "flock shared"); |
