[glib] Fix the build on Solaris



commit 23d6d1769bc95eba6029dae4593755154c320cf4
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Feb 10 11:42:58 2013 -0500

    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

 configure.ac |    1 -
 gio/gfile.c  |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2d75253..cbac8e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/gio/gfile.c b/gio/gfile.c
index 04b5239..6d281e6 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -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;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]