aboutsummaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
Diffstat (limited to 'io')
-rw-r--r--io/sys/stat.h23
-rw-r--r--io/sys/statvfs.h22
2 files changed, 32 insertions, 13 deletions
diff --git a/io/sys/stat.h b/io/sys/stat.h
index d6175dd0cd..18eafb4bca 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 1995-1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -106,13 +106,11 @@ __BEGIN_DECLS
# ifdef __S_IFIFO
# define S_IFIFO __S_IFIFO
# endif
-# if defined __USE_BSD || defined __USE_MISC
-# ifdef __S_IFLNK
-# define S_IFLNK __S_IFLNK
-# endif
-# ifdef __S_IFSOCK
-# define S_IFSOCK __S_IFSOCK
-# endif
+# ifdef __S_IFLNK
+# define S_IFLNK __S_IFLNK
+# endif
+# if (defined __USE_BSD || defined __USE_MISC) && !defined __S_IFSOCK
+# define S_IFSOCK __S_IFSOCK
# endif
#endif
@@ -127,11 +125,12 @@ __BEGIN_DECLS
#ifdef __S_IFIFO
# define S_ISFIFO(mode) __S_ISTYPE((mode), __S_IFIFO)
#endif
+#ifdef __S_IFLNK
+# define S_ISLNK(mode) __S_ISTYPE((mode), __S_IFLNK)
+#endif
#ifdef __USE_BSD
-# ifdef __S_IFLNK
-# define S_ISLNK(mode) __S_ISTYPE((mode), __S_IFLNK)
-# else
+# ifndef __S_IFLNK
# define S_ISLNK(mode) 0
# endif
# ifdef __S_IFSOCK
@@ -145,7 +144,7 @@ __BEGIN_DECLS
#define S_ISUID __S_ISUID /* Set user ID on execution. */
#define S_ISGID __S_ISGID /* Set group ID on execution. */
-#if defined __USE_BSD || defined __USE_MISC
+#if defined __USE_BSD || defined __USE_MISC || defined __USE_XOPEN
/* Save swapped text after use (sticky bit). This is pretty well obsolete. */
# define S_ISVTX __S_ISVTX
#endif
diff --git a/io/sys/statvfs.h b/io/sys/statvfs.h
index 6f497cc4a7..71335f324f 100644
--- a/io/sys/statvfs.h
+++ b/io/sys/statvfs.h
@@ -1,5 +1,5 @@
/* Definitions for getting information about a filesystem.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -25,6 +25,26 @@
/* Get the system-specific definition of `struct statfs'. */
#include <bits/statvfs.h>
+#ifndef __USE_FILE_OFFSET64
+# ifndef __fsblkcnt_t_defined
+typedef __fsblkcnt_t fsblkcnt_t; /* Type to count file system blocks. */
+# define __fsblkcnt_t_defined
+# endif
+# ifndef __fsfilcnt_t_defined
+typedef __fsfilcnt_t fsfilcnt_t; /* Type to count file system inodes. */
+# define __fsfilcnt_t_defined
+# endif
+#else
+# ifndef __fsblkcnt_t_defined
+typedef __fsblkcnt64_t fsblkcnt_t; /* Type to count file system blocks. */
+# define __fsblkcnt_t_defined
+# endif
+# ifndef __fsfilcnt_t_defined
+typedef __fsfilcnt64_t fsfilcnt_t; /* Type to count file system inodes. */
+# define __fsfilcnt_t_defined
+# endif
+#endif
+
__BEGIN_DECLS
/* Return information about the filesystem on which FILE resides. */