aboutsummaryrefslogtreecommitdiffstats
path: root/main/btrfs-progs/includes.patch
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2018-03-18 06:34:57 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-03-26 19:06:32 +0000
commitcf73b1506002d7d10c6c846278e9f2871e083986 (patch)
treef2d8138aca68e458f28ea5b5475651d3b174583e /main/btrfs-progs/includes.patch
parentcb048d0392e835d8e534a9fe278d18e2874df05f (diff)
downloadaports-cf73b1506002d7d10c6c846278e9f2871e083986.tar.bz2
aports-cf73b1506002d7d10c6c846278e9f2871e083986.tar.xz
main/btrfs-progs: upgrade to 4.15.1, clarify license
Diffstat (limited to 'main/btrfs-progs/includes.patch')
-rw-r--r--main/btrfs-progs/includes.patch23
1 files changed, 0 insertions, 23 deletions
diff --git a/main/btrfs-progs/includes.patch b/main/btrfs-progs/includes.patch
index a0b2c1aae9..8624cec83e 100644
--- a/main/btrfs-progs/includes.patch
+++ b/main/btrfs-progs/includes.patch
@@ -24,26 +24,3 @@ index bb03194e127e..28f832a2e625 100644
#include <stdint.h>
#define ptr_to_u64(x) ((u64)(uintptr_t)x)
---- a/kernel-lib/rbtree.h
-+++ b/kernel-lib/rbtree.h
-@@ -38,6 +38,10 @@
- extern "C" {
- #endif
-
-+#ifndef __always_inline
-+#define __always_inline inline __attribute__((always_inline))
-+#endif
-+
- struct rb_node {
- unsigned long __rb_parent_color;
- struct rb_node *rb_right;
---- a/convert/source-fs.h
-+++ b/convert/source-fs.h
-@@ -20,6 +20,7 @@
- #include "kerncompat.h"
- #include <linux/kdev_t.h>
- #include <pthread.h>
-+#include <sys/types.h>
-
- #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID
-