Commit 23d6d176 authored by Matthias Clasen's avatar Matthias Clasen

Fix the build on Solaris

Make the btrfs support explicitly linux-only, as that is what it
is. With this, there's no need anymore to check for sys/ioctl.h
either.
https://bugzilla.gnome.org/show_bug.cgi?id=692829
parent 27ecab75
......@@ -893,7 +893,6 @@ AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h])
AC_CHECK_HEADERS([linux/magic.h])
AC_CHECK_HEADERS([sys/prctl.h])
AC_CHECK_HEADERS([sys/ioctl.h])
AC_CHECK_HEADERS([sys/mount.h sys/sysctl.h], [], [],
[#if HAVE_SYS_PARAM_H
......
......@@ -24,7 +24,7 @@
#include "config.h"
#if HAVE_SYS_IOCTL_H
#ifdef __linux__
#include <sys/ioctl.h>
#include <errno.h>
/* See linux.git/fs/btrfs/ioctl.h */
......@@ -2924,7 +2924,7 @@ splice_stream_with_progress (GInputStream *in,
}
#endif
#ifdef HAVE_SYS_IOCTL_H
#ifdef __linux__
static gboolean
btrfs_reflink_with_progress (GInputStream *in,
GOutputStream *out,
......@@ -3052,7 +3052,7 @@ file_copy_fallback (GFile *source,
if (!out)
goto out;
#ifdef HAVE_SYS_IOCTL_H
#ifdef __linux__
if (G_IS_FILE_DESCRIPTOR_BASED (in) && G_IS_FILE_DESCRIPTOR_BASED (out))
{
GError *reflink_err = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment