[nautilus] Remove useless statfs/statvfs checks
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: svn-commits-list gnome org
- Subject: [nautilus] Remove useless statfs/statvfs checks
- Date: Thu, 28 May 2009 10:45:44 -0400 (EDT)
commit 5bff677a0dc3ab5d5c68a2ef107cdbb34f133b34
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Thu May 28 16:45:23 2009 +0200
Remove useless statfs/statvfs checks
Those checks are now obsoletes. This also fixes bug #583264.
---
configure.in | 49 +------------------------------
src/file-manager/fm-properties-window.c | 3 --
2 files changed, 1 insertions(+), 51 deletions(-)
diff --git a/configure.in b/configure.in
index 3b508f7..3479598 100644
--- a/configure.in
+++ b/configure.in
@@ -113,55 +113,8 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
dnl ==========================================================================
AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/param.h malloc.h)
+AC_CHECK_FUNCS(mallopt)
-dnl ==========================================================================
-
-AC_CHECK_FUNCS(statfs statvfs mallopt)
-AC_CHECK_HEADERS(sys/statfs.h sys/statvfs.h)
-
-dnl
-dnl if statfs() takes 2 arguments or 4 (Solaris)
-dnl
-if test "$ac_cv_func_statfs" = yes ; then
- AC_MSG_CHECKING([number of arguments to statfs()])
- AC_TRY_COMPILE([#include <unistd.h>
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
- #ifdef HAVE_SYS_MOUNT_H
- #include <sys/mount.h>
- #endif
- #ifdef HAVE_SYS_STATFS_H
- #include <sys/statfs.h>
- #endif], [struct statfs st;
- statfs(NULL, &st);],[
- AC_MSG_RESULT([2])
- AC_DEFINE(STATFS_ARGS, 2, [Number of arguments to statfs()])],[
- AC_TRY_COMPILE([#include <unistd.h>
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
- #ifdef HAVE_SYS_MOUNT_H
- #include <sys/mount.h>
- #endif
- #ifdef HAVE_SYS_STATFS_H
- #include <sys/statfs.h>
- #endif], [struct statfs st;
- statfs(NULL, &st, sizeof (st), 0);],[
- AC_MSG_RESULT([4])
- AC_DEFINE(STATFS_ARGS, 4, [Number of arguments to statfs()])],[
- AC_MSG_RESULT(unknown)
- AC_MSG_ERROR([unable to determine number of arguments to statfs()])])])
-fi dnl test "$ac_cv_func_statfs" = yes
-
-dnl ==========================================================================
-
dnl X
x_libs="`$PKG_CONFIG --libs pangox`"
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index e2b6800..9e17290 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -62,9 +62,6 @@
#include <sys/stat.h>
#include <cairo.h>
-#if HAVE_SYS_STATVFS_H
-#include <sys/statvfs.h>
-#endif
#if HAVE_SYS_VFS_H
#include <sys/vfs.h>
#elif HAVE_SYS_MOUNT_H
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]