Merge pull request #945 from kraj/kraj/musl

Fixes for building on musl systems
openSUSE · Oct 21, 2024 · 6a74818 · 6a74818
2 parents 64efd34 + 0b39f44
commit 6a74818
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/snapper/BcachefsUtils.cc b/snapper/BcachefsUtils.cc
@@ -24,6 +24,7 @@
 
 #include <cstring>
 #include <cerrno>
+#include <linux/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 

diff --git a/snapper/FileUtils.cc b/snapper/FileUtils.cc
@@ -387,9 +387,9 @@ namespace snapper
     std::pair<unsigned long long, unsigned long long>
     SDir::statvfs() const
     {
-	struct statvfs64 fsbuf;
-	if (fstatvfs64(dirfd, &fsbuf) != 0)
-	    SN_THROW(IOErrorException(sformat("statvfs64 failed path:%s errno:%d (%s)", base_path.c_str(),
+	struct statvfs fsbuf;
+	if (fstatvfs(dirfd, &fsbuf) != 0)
+	    SN_THROW(IOErrorException(sformat("statvfs failed path:%s errno:%d (%s)", base_path.c_str(),
 					      errno, stringerror(errno).c_str())));
 
 	// f_bavail is used (not f_bfree) since df seems to do the