From 22bc1d808ebb6c3958e8231a36b73cd45a7f2c30 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Mon, 3 Dec 2018 17:33:49 -0600 Subject: [PATCH] Work around btrfs v4.19 Addresses #459 --- snapper/Btrfs.cc | 3 +++ snapper/BtrfsUtils.cc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc index cb9f7b35..c05557b1 100644 --- a/snapper/Btrfs.cc +++ b/snapper/Btrfs.cc @@ -41,6 +41,9 @@ #include #include #include +#ifdef swap +#undef swap +#endif #include #include #endif diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc index bada3f84..9edc325c 100644 --- a/snapper/BtrfsUtils.cc +++ b/snapper/BtrfsUtils.cc @@ -34,6 +34,9 @@ #ifdef HAVE_LIBBTRFS #include #include +#ifdef swap +#undef swap +#endif #endif #include #include -- 2.47.3