Author: kib
Date: Tue Jul 15 10:07:05 2014
New Revision: 268664
URL: http://svnweb.freebsd.org/changeset/base/268664
Log:
MFC r268385:
Make this compilable on latest Linux'es without warnings.
Modified:
stable/9/tools/regression/file/flock/flock.c
Directory Properties:
stable/9/tools/regression/file/flock/ (props changed)
Modified: stable/9/tools/regression/file/flock/flock.c
==============================================================================
--- stable/9/tools/regression/file/flock/flock.c Tue Jul 15 10:05:52
2014 (r268663)
+++ stable/9/tools/regression/file/flock/flock.c Tue Jul 15 10:07:05
2014 (r268664)
@@ -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
*/
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
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");
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
