mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-24 14:36:13 +01:00
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
This commit is contained in:
parent
27ecab7553
commit
23d6d1769b
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user