luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 05:13:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the build on Solaris

Browse Source 
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:
Matthias Clasen 2013-02-10 11:42:58 -05:00
parent 27ecab7553
commit 23d6d1769b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -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([sys/uio.h sys/mkdev.h])
AC_CHECK_HEADERS([linux/magic.h]) AC_CHECK_HEADERS([linux/magic.h])
AC_CHECK_HEADERS([sys/prctl.h]) AC_CHECK_HEADERS([sys/prctl.h])
AC_CHECK_HEADERS([sys/ioctl.h])
AC_CHECK_HEADERS([sys/mount.h sys/sysctl.h], [], [], AC_CHECK_HEADERS([sys/mount.h sys/sysctl.h], [], [],
[#if HAVE_SYS_PARAM_H [#if HAVE_SYS_PARAM_H

6
gio/gfile.c
View File

@ -24,7 +24,7 @@
#include "config.h" #include "config.h"
#if HAVE_SYS_IOCTL_H #ifdef __linux__
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <errno.h> #include <errno.h>
/* See linux.git/fs/btrfs/ioctl.h */ /* See linux.git/fs/btrfs/ioctl.h */
@ -2924,7 +2924,7 @@ splice_stream_with_progress (GInputStream *in,
} }
#endif #endif
#ifdef HAVE_SYS_IOCTL_H #ifdef __linux__
static gboolean static gboolean
btrfs_reflink_with_progress (GInputStream *in, btrfs_reflink_with_progress (GInputStream *in,
GOutputStream *out, GOutputStream *out,
@ -3052,7 +3052,7 @@ file_copy_fallback (GFile *source,
if (!out) if (!out)
goto out; goto out;
#ifdef HAVE_SYS_IOCTL_H #ifdef __linux__
if (G_IS_FILE_DESCRIPTOR_BASED (in) && G_IS_FILE_DESCRIPTOR_BASED (out)) if (G_IS_FILE_DESCRIPTOR_BASED (in) && G_IS_FILE_DESCRIPTOR_BASED (out))
{ {
GError *reflink_err = NULL; GError *reflink_err = NULL;