summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/alpha/include/ansi.h1
-rw-r--r--sys/i386/include/ansi.h1
-rw-r--r--sys/ia64/include/ansi.h1
-rw-r--r--sys/powerpc/include/ansi.h1
-rw-r--r--sys/sparc64/include/ansi.h1
-rw-r--r--sys/sys/param.h2
-rw-r--r--sys/sys/stat.h16
-rw-r--r--sys/sys/types.h5
8 files changed, 22 insertions, 6 deletions
diff --git a/sys/alpha/include/ansi.h b/sys/alpha/include/ansi.h
index fb37f9a..eccfad9 100644
--- a/sys/alpha/include/ansi.h
+++ b/sys/alpha/include/ansi.h
@@ -49,6 +49,7 @@
*/
#define _BSD_CLOCK_T_ int /* clock() */
#define _BSD_CLOCKID_T_ int /* clock_gettime()... */
+#define _BSD_FFLAGS_T_ __uint_least32_t /* file flags */
#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */
#define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index 46407d5..788db09 100644
--- a/sys/i386/include/ansi.h
+++ b/sys/i386/include/ansi.h
@@ -48,6 +48,7 @@
*/
#define _BSD_CLOCK_T_ unsigned long /* clock()... */
#define _BSD_CLOCKID_T_ int /* clock_gettime()... */
+#define _BSD_FFLAGS_T_ __uint_least32_t /* file flags */
#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */
#define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */
diff --git a/sys/ia64/include/ansi.h b/sys/ia64/include/ansi.h
index 3c5f632..6c15635 100644
--- a/sys/ia64/include/ansi.h
+++ b/sys/ia64/include/ansi.h
@@ -49,6 +49,7 @@
*/
#define _BSD_CLOCK_T_ int /* clock() */
#define _BSD_CLOCKID_T_ int /* clockid_t */
+#define _BSD_FFLAGS_T_ __uint_least32_t /* file flags */
#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */
#define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */
diff --git a/sys/powerpc/include/ansi.h b/sys/powerpc/include/ansi.h
index 017d5fd..0c31d4d 100644
--- a/sys/powerpc/include/ansi.h
+++ b/sys/powerpc/include/ansi.h
@@ -47,6 +47,7 @@
* #endif
*/
#define _BSD_CLOCK_T_ int /* clock() */
+#define _BSD_FFLAGS_T_ __uint_least32_t /* file flags */
#define _BSD_CLOCKID_T_ int /* clockid_t */
#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */
diff --git a/sys/sparc64/include/ansi.h b/sys/sparc64/include/ansi.h
index 49e76c3..8b3092c 100644
--- a/sys/sparc64/include/ansi.h
+++ b/sys/sparc64/include/ansi.h
@@ -49,6 +49,7 @@
*/
#define _BSD_CLOCK_T_ int /* clock() */
#define _BSD_CLOCKID_T_ int /* clock_gettime()... */
+#define _BSD_FFLAGS_T_ __uint_least32_t /* file flags */
#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */
#define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */
diff --git a/sys/sys/param.h b/sys/sys/param.h
index e38b318..fe77232 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -52,7 +52,7 @@
* there.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 500029 /* Master, propagated to newvers */
+#define __FreeBSD_version 500030 /* Master, propagated to newvers */
#ifndef NULL
#define NULL 0
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 15367b3..8a03251 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -42,6 +42,14 @@
#ifndef _SYS_STAT_H_
#define _SYS_STAT_H_
+#include <sys/cdefs.h>
+#include <machine/ansi.h>
+
+#ifdef _BSD_FFLAGS_T_
+typedef _BSD_FFLAGS_T_ fflags_t; /* file flags */
+#undef _BSD_FFLAGS_T_
+#endif
+
#if !defined(_KERNEL) && !defined(_POSIX_SOURCE)
/*
* XXX we need this for struct timespec. We get miscellaneous namespace
@@ -71,7 +79,7 @@ struct ostat {
struct timespec st_ctimespec; /* time of last file status change */
int32_t st_blksize; /* optimal blocksize for I/O */
int32_t st_blocks; /* blocks allocated for file */
- u_int32_t st_flags; /* user defined flags for file */
+ fflags_t st_flags; /* user defined flags for file */
u_int32_t st_gen; /* file generation number */
};
#endif /* !_POSIX_SOURCE */
@@ -99,7 +107,7 @@ struct stat {
off_t st_size; /* file size, in bytes */
int64_t st_blocks; /* blocks allocated for file */
u_int32_t st_blksize; /* optimal blocksize for I/O */
- u_int32_t st_flags; /* user defined flags for file */
+ fflags_t st_flags; /* user defined flags for file */
u_int32_t st_gen; /* file generation number */
int32_t st_lspare;
int64_t st_qspare[2];
@@ -129,7 +137,7 @@ struct nstat {
off_t st_size; /* file size, in bytes */
int64_t st_blocks; /* blocks allocated for file */
u_int32_t st_blksize; /* optimal blocksize for I/O */
- u_int32_t st_flags; /* user defined flags for file */
+ fflags_t st_flags; /* user defined flags for file */
u_int32_t st_gen; /* file generation number */
int64_t st_qspare[2];
};
@@ -237,8 +245,6 @@ struct nstat {
#endif /* !_POSIX_SOURCE */
#ifndef _KERNEL
-#include <sys/cdefs.h>
-
__BEGIN_DECLS
int chmod __P((const char *, mode_t));
int fstat __P((int, struct stat *));
diff --git a/sys/sys/types.h b/sys/sys/types.h
index b28481d..f01d985 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -138,6 +138,11 @@ typedef _BSD_CLOCKID_T_ clockid_t;
#undef _BSD_CLOCKID_T_
#endif
+#ifdef _BSD_FFLAGS_T_
+typedef _BSD_FFLAGS_T_ fflags_t; /* file flags */
+#undef _BSD_FFLAGS_T_
+#endif
+
/* XXX: Deprecated; now defined in <arpa/inet.h>. */
#ifndef _IN_ADDR_T_DECLARED_
typedef __uint32_t in_addr_t;
OpenPOWER on IntegriCloud