1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* file.c (HAVE_STRUCT_STATVFS_F_BASETYPE): File::Statfs#fstypename

is supported on AIX, HP-UX, and Solaris, by using the value of
  struct statvfs.f_basetype.
* configure.in (HAVE_STRUCT_STATVFS_F_BASETYPE): check struct
  statvfs.f_basetype which is available on AIX, HP-UX, and Solaris.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ngoto 2014-05-02 15:24:04 +00:00
parent 1388beb195
commit 09f51c56d8
3 changed files with 17 additions and 2 deletions

View file

@ -1,3 +1,12 @@
Sat May 3 00:06:30 2014 Naohisa Goto <ngotogenome@gmail.com>
* file.c (HAVE_STRUCT_STATVFS_F_BASETYPE): File::Statfs#fstypename
is supported on AIX, HP-UX, and Solaris, by using the value of
struct statvfs.f_basetype.
* configure.in (HAVE_STRUCT_STATVFS_F_BASETYPE): check struct
statvfs.f_basetype which is available on AIX, HP-UX, and Solaris.
Fri May 2 21:04:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri May 2 21:04:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (next_id): no reason to set ID_STATIC_SYM here, as ID * parse.y (next_id): no reason to set ID_STATIC_SYM here, as ID

View file

@ -1746,9 +1746,12 @@ AC_CHECK_MEMBERS([struct statfs.f_type, struct statfs.f_fstypename], [], [], [@%
@%:@ include <sys/vfs.h> @%:@ include <sys/vfs.h>
@%:@endif]) @%:@endif])
]) ])
# NetBSD # AIX, HP-UX, NetBSD, Solaris
AC_CHECK_TYPES([struct statvfs], [], [], [@%:@ include <sys/statvfs.h>]) AC_CHECK_TYPES([struct statvfs], [], [], [@%:@ include <sys/statvfs.h>])
# NetBSD
AC_CHECK_MEMBERS([struct statvfs.f_fstypename], [], [], [@%:@ include <sys/statvfs.h>]) AC_CHECK_MEMBERS([struct statvfs.f_fstypename], [], [], [@%:@ include <sys/statvfs.h>])
# AIX, HP-UX, Solaris
AC_CHECK_MEMBERS([struct statvfs.f_basetype], [], [], [@%:@ include <sys/statvfs.h>])
AC_CHECK_TYPES([clockid_t], [], [], [@%:@ifdef HAVE_TIME_H AC_CHECK_TYPES([clockid_t], [], [], [@%:@ifdef HAVE_TIME_H
@%:@ include <time.h> @%:@ include <time.h>

5
file.c
View file

@ -87,8 +87,11 @@ typedef struct statvfs statfs_t;
# ifdef HAVE_FSTATVFS # ifdef HAVE_FSTATVFS
# define FSTATFS(f, s) fstatvfs((f), (s)) # define FSTATFS(f, s) fstatvfs((f), (s))
# endif # endif
# ifdef HAVE_STRUCT_STATVFS_F_FSTYPENAME # if defined(HAVE_STRUCT_STATVFS_F_FSTYPENAME) /* NetBSD */
# define HAVE_STRUCT_STATFS_T_F_FSTYPENAME 1 # define HAVE_STRUCT_STATFS_T_F_FSTYPENAME 1
# elif defined(HAVE_STRUCT_STATVFS_F_BASETYPE) /* AIX, HP-UX, Solaris */
# define HAVE_STRUCT_STATFS_T_F_FSTYPENAME 1
# define f_fstypename f_basetype
# endif # endif
# ifdef HAVE_STRUCT_STATVFS_F_TYPE # ifdef HAVE_STRUCT_STATVFS_F_TYPE
# define HAVE_STRUCT_STATFS_T_F_TYPE 1 # define HAVE_STRUCT_STATFS_T_F_TYPE 1