Update of /cvsroot/libsysio/libsysio/include
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5699/include
Modified Files:
dev.h inode.h sysio-cmn.h sysio.h
Log Message:
add ifdef _HAVE_STATVFS
Index: dev.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/dev.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -b -B -p -r1.11 -r1.12
--- dev.h 30 Apr 2007 23:24:12 -0000 1.11
+++ dev.h 9 May 2007 23:16:20 -0000 1.12
@@ -136,10 +136,12 @@ extern const struct inode_ops _sysio_nod
(int (*)(struct pnode *, \
mode_t, \
dev_t))_sysio_do_illop
+#ifdef _HAVE_STATVFS
#define _sysio_nodev_inop_statvfs \
(int (*)(struct pnode *, \
struct inode *, \
struct intnl_statvfs *))_sysio_do_illop
+#endif
#define _sysio_nodev_inop_gone \
(void (*)(struct inode *ino))_sysio_do_noop
Index: inode.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/inode.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -b -B -p -r1.30 -r1.31
--- inode.h 1 May 2007 16:33:52 -0000 1.30
+++ inode.h 9 May 2007 23:16:20 -0000 1.31
@@ -63,7 +63,9 @@ struct inode;
struct intent;
struct intnl_dirent;
struct intnl_stat;
+#ifdef _HAVE_STATVFS
struct intnl_statvfs;
+#endif
struct io_arguments;
struct ioctx;
@@ -106,9 +108,11 @@ struct inode_ops {
int (*inop_datasync)(struct inode *ino);
int (*inop_ioctl)(struct inode *ino, unsigned long int request, va_list ap);
int (*inop_mknod)(struct pnode *pno, mode_t mode, dev_t dev);
+#ifdef _HAVE_STATVFS
int (*inop_statvfs)(struct pnode *pno,
struct inode *ino,
struct intnl_statvfs *buf);
+#endif
void (*inop_gone)(struct inode *ino);
};
@@ -339,8 +343,10 @@ struct pnode {
_PNOP_CALL((_pno), ioctl, (_pno)->p_base->pb_ino, (_request), (_ap))
#define PNOP_MKNOD(_pno, _mode, _dev) \
_PNOP_MKCALL((_pno), mknod, (_pno), (_mode), (_dev))
+#ifdef _HAVE_STATVFS
#define PNOP_STATVFS(_pno, _buf) \
_PNOP_CALL((_pno), statvfs, (_pno), (_pno)->p_base->pb_ino, (_buf))
+#endif
#define PNOP_GONE(_pno) \
_PNOP_CALL((_pno), gone, (_pno)->p_base->pb_ino)
Index: sysio-cmn.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/sysio-cmn.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -b -B -p -r1.15 -r1.16
--- sysio-cmn.h 1 May 2007 16:33:52 -0000 1.15
+++ sysio-cmn.h 9 May 2007 23:16:20 -0000 1.16
@@ -191,10 +191,12 @@ typedef enum {
_SYSIO_TTAG(rmdir),
_SYSIO_TTAG(xstatnd),
_SYSIO_TTAG(fxstat),
+#ifdef _HAVE_STATVFS
_SYSIO_TTAG(statvfs64),
_SYSIO_TTAG(fstatvfs64),
_SYSIO_TTAG(statvfs),
_SYSIO_TTAG(fstatvfs),
+#endif
_SYSIO_TTAG(opendir),
_SYSIO_TTAG(closedir),
_SYSIO_TTAG(symlink),
Index: sysio.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/sysio.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -w -b -B -p -r1.41 -r1.42
--- sysio.h 1 May 2007 16:33:52 -0000 1.41
+++ sysio.h 9 May 2007 23:16:20 -0000 1.42
@@ -94,17 +94,19 @@ struct dirent;
#endif
struct stat;
+#ifdef _HAVE_STATVFS
#ifdef _LARGEFILE64_SOURCE
#define intnl_statvfs statvfs64
#else
#define intnl_statvfs statvfs
#endif
struct statvfs;
+struct intnl_statvfs;
+#endif
struct utimbuf;
struct intnl_stat;
-struct intnl_statvfs;
struct pnode;
@@ -226,6 +228,7 @@ extern ssize_t SYSIO_INTERFACE_NAME(pwri
extern ssize_t SYSIO_INTERFACE_NAME(writev)(int fd,
const struct iovec *iov,
int count);
+#ifdef _HAVE_STATVFS
extern int SYSIO_INTERFACE_NAME(statvfs)(const char *path, struct statvfs *buf);
#ifdef _LARGEFILE64_SOURCE
extern int SYSIO_INTERFACE_NAME(statvfs64)(const char *path,
@@ -235,6 +238,7 @@ extern int SYSIO_INTERFACE_NAME(fstatvfs
#ifdef _LARGEFILE64_SOURCE
extern int SYSIO_INTERFACE_NAME(fstatvfs64)(int fd, struct statvfs64 *buf);
#endif
+#endif
extern int SYSIO_INTERFACE_NAME(truncate)(const char *path, off_t length);
#ifdef _LARGEFILE64_SOURCE
extern int SYSIO_INTERFACE_NAME(truncate64)(const char *path, off64_t length);
|
