Fix double-inclusion problem of bits/stat.h.

This commit is contained in:
Ulrich Drepper 2010-01-11 11:03:27 -08:00
parent 7b4715c536
commit 64c1f3af5d
10 changed files with 56 additions and 1 deletions

View File

@ -1,5 +1,15 @@
2010-01-11 Ulrich Drepper <drepper@redhat.com> 2010-01-11 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/bsd/bits/stat.h: Fix double-inclusion problem.
* sysdeps/unix/sysv/linux/powerpc/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/stat.h: Likewise.
* sysdeps/unix/sysv/bits/stat.h: Likewise.
* sysdeps/mach/hurd/bits/stat.h: Likewise.
* bits/confname.h: Fix typo in last change. * bits/confname.h: Fix typo in last change.
* conform/data/unistd.h-data: lockf-constants Not needed for POSIX. * conform/data/unistd.h-data: lockf-constants Not needed for POSIX.

View File

@ -21,6 +21,9 @@
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
#endif #endif
#ifndef _BITS_STAT_H
#define _BITS_STAT_H 1
#include <bits/types.h> #include <bits/types.h>
/* NOTE: The size of this structure (32 ints) is known in /* NOTE: The size of this structure (32 ints) is known in
@ -195,3 +198,5 @@ struct stat64
#ifdef __USE_BSD #ifdef __USE_BSD
# define CMASK 0022 # define CMASK 0022
#endif #endif
#endif /* bits/stat.h */

View File

@ -20,6 +20,9 @@
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
#endif #endif
#ifndef _BITS_STAT_H
#define _BITS_STAT_H 1
#include <bits/types.h> #include <bits/types.h>
/* Structure describing file characteristics. */ /* Structure describing file characteristics. */
@ -84,3 +87,5 @@ struct stat
#define __S_IREAD 0400 /* Read by owner. */ #define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */ #define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */ #define __S_IEXEC 0100 /* Execute by owner. */
#endif /* bits/stat.h */

View File

@ -20,6 +20,9 @@
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
#endif #endif
#ifndef _BITS_STAT_H
#define _BITS_STAT_H 1
struct stat struct stat
{ {
short int st_dev; short int st_dev;
@ -63,3 +66,5 @@ struct stat
#define __S_IREAD 0400 /* Read by owner. */ #define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */ #define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */ #define __S_IEXEC 0100 /* Execute by owner. */
#endif /* bits/stat.h */

View File

@ -20,6 +20,9 @@
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
#endif #endif
#ifndef _BITS_STAT_H
#define _BITS_STAT_H 1
/* Versions of the `struct stat' data structure. */ /* Versions of the `struct stat' data structure. */
#define _STAT_VER_LINUX_OLD 1 #define _STAT_VER_LINUX_OLD 1
#define _STAT_VER_KERNEL 1 #define _STAT_VER_KERNEL 1
@ -166,3 +169,5 @@ struct stat64
# define UTIME_NOW ((1l << 30) - 1l) # define UTIME_NOW ((1l << 30) - 1l)
# define UTIME_OMIT ((1l << 30) - 2l) # define UTIME_OMIT ((1l << 30) - 2l)
#endif #endif
#endif /* bits/stat.h */

View File

@ -20,6 +20,9 @@
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
#endif #endif
#ifndef _BITS_STAT_H
#define _BITS_STAT_H 1
/* Versions of the `struct stat' data structure. */ /* Versions of the `struct stat' data structure. */
#define _STAT_VER_KERNEL 0 #define _STAT_VER_KERNEL 0
#define _STAT_VER_LINUX 1 #define _STAT_VER_LINUX 1
@ -143,3 +146,5 @@ struct stat64
# define UTIME_NOW ((1l << 30) - 1l) # define UTIME_NOW ((1l << 30) - 1l)
# define UTIME_OMIT ((1l << 30) - 2l) # define UTIME_OMIT ((1l << 30) - 2l)
#endif #endif
#endif /* bits//stat.h */

View File

@ -21,6 +21,9 @@
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
#endif #endif
#ifndef _BITS_STAT_H
#define _BITS_STAT_H 1
#include <bits/wordsize.h> #include <bits/wordsize.h>
/* Versions of the `struct stat' data structure. */ /* Versions of the `struct stat' data structure. */
@ -270,3 +273,5 @@ struct stat64
# define UTIME_NOW ((1l << 30) - 1l) # define UTIME_NOW ((1l << 30) - 1l)
# define UTIME_OMIT ((1l << 30) - 2l) # define UTIME_OMIT ((1l << 30) - 2l)
#endif #endif
#endif /* bits/stat.h */

View File

@ -20,6 +20,9 @@
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
#endif #endif
#ifndef _BITS_STAT_H
#define _BITS_STAT_H 1
#include <bits/wordsize.h> #include <bits/wordsize.h>
#if __WORDSIZE == 64 #if __WORDSIZE == 64
@ -259,3 +262,5 @@ struct stat64
# define UTIME_NOW ((1l << 30) - 1l) # define UTIME_NOW ((1l << 30) - 1l)
# define UTIME_OMIT ((1l << 30) - 2l) # define UTIME_OMIT ((1l << 30) - 2l)
#endif #endif
#endif /* bits/stat.h */

View File

@ -20,6 +20,9 @@
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
#endif #endif
#ifndef _BITS_STAT_H
#define _BITS_STAT_H 1
/* Versions of the `struct stat' data structure. */ /* Versions of the `struct stat' data structure. */
#define _STAT_VER_LINUX_OLD 1 #define _STAT_VER_LINUX_OLD 1
#define _STAT_VER_KERNEL 1 #define _STAT_VER_KERNEL 1
@ -167,3 +170,5 @@ struct stat64
# define UTIME_NOW ((1l << 30) - 1l) # define UTIME_NOW ((1l << 30) - 1l)
# define UTIME_OMIT ((1l << 30) - 2l) # define UTIME_OMIT ((1l << 30) - 2l)
#endif #endif
#endif /* bits/stat.h */

View File

@ -20,6 +20,9 @@
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
#endif #endif
#ifndef _BITS_STAT_H
#define _BITS_STAT_H 1
/* Versions of the `struct stat' data structure. */ /* Versions of the `struct stat' data structure. */
#define _STAT_VER_KERNEL 0 #define _STAT_VER_KERNEL 0
@ -206,3 +209,5 @@ struct stat64
# define UTIME_NOW ((1l << 30) - 1l) # define UTIME_NOW ((1l << 30) - 1l)
# define UTIME_OMIT ((1l << 30) - 2l) # define UTIME_OMIT ((1l << 30) - 2l)
#endif #endif
#endif /* bits/stat.h */