From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 13 Jun 2007 13:16:50 +0000 (+0200)
Subject: splice.h: SPLICE_F_UNMAP definition update
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4ffe329a592b295778ce1a8cd290001fe711af3c;p=splice.git

splice.h: SPLICE_F_UNMAP definition update

That flag was introduced after the others, so check for it
seperately in the header. Fixes compile on systems splice
in the /usr/include headers.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/splice.h b/splice.h
index 5321662..66075a1 100644
--- a/splice.h
+++ b/splice.h
@@ -34,10 +34,16 @@
 				 /* from/to, of course */
 #define SPLICE_F_MORE	(0x04)	/* expect more data */
 #define SPLICE_F_GIFT   (0x08)  /* pages passed in are a gift */
-#define SPLICE_F_UNMAP	(0x10)	/* undo vmsplice map */
 
 #endif /* SPLICE_F_MOVE defined */
 
+/*
+ * SPLICE_F_UNMAP was introduced later, so check for that seperately
+ */
+#ifndef SPLICE_F_UNMAP
+#define SPLICE_F_UNMAP	(0x10)	/* undo vmsplice map */
+#endif
+
 static inline int ssplice(int fdin, loff_t *off_in, int fdout, loff_t *off_out,
 			  size_t len, unsigned int flags)
 {