From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Mon, 3 Dec 2018 23:33:49 +0000 (-0600)
Subject: Work around btrfs v4.19
X-Git-Tag: v0.8.2~7^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22bc1d808ebb6c3958e8231a36b73cd45a7f2c30;p=thirdparty%2Fsnapper.git

Work around btrfs v4.19

Addresses #459
---

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 <btrfs/send.h>
 #include <btrfs/send-stream.h>
 #include <btrfs/send-utils.h>
+#ifdef swap
+#undef swap
+#endif
 #include <boost/version.hpp>
 #include <boost/thread.hpp>
 #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 <btrfs/ioctl.h>
 #include <btrfs/send-utils.h>
+#ifdef swap
+#undef swap
+#endif
 #endif
 #include <algorithm>
 #include <functional>