Work around btrfs v4.19

Addresses #459

diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
index cb9f7b35800d7743e196c06bfe6dd3f3058bbb4e..c05557b1d68a93470f8d581ebe0df5d95e9cf2aa 100644 (file)
--- 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 bada3f843cb1b9938653093cfa7df4bfaa9e0ad1..9edc325c88370798408d9e2ef1936d3d1d228844 100644 (file)
--- 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>