diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-01-11 11:19:01 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-01-11 15:53:55 +0100 |
| commit | 2ee1283c60d2ce22a3e17bff4b83b6b7f26f4ba0 (patch) | |
| tree | 8be90b58af821221e103b1d16214f6f949aacfca | |
| parent | 16ea7828d79a56277ceb945224ab7d40e7ac14d6 (diff) | |
Include <bits/stat.h> only once
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | io/fcntl.h | 5 | ||||
| -rw-r--r-- | io/sys/stat.h | 5 |
3 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2010-01-11 Andreas Schwab <schwab@redhat.com> + * io/fcntl.h: Only include <bits/stat.h> once. + * io/sys/stat.h: Likewise. + * bits/confname.h: Add missing comma, remove trailing commas. 2010-01-10 Ulrich Drepper <drepper@redhat.com> diff --git a/io/fcntl.h b/io/fcntl.h index 4eb003be46..d54fcf18b2 100644 --- a/io/fcntl.h +++ b/io/fcntl.h @@ -38,7 +38,10 @@ __BEGIN_DECLS # include <bits/types.h> /* For __mode_t and __dev_t. */ # define __need_timespec # include <time.h> -# include <bits/stat.h> +# ifndef __bits_stat_h_included +# include <bits/stat.h> +# define __bits_stat_h_included +# endif # define S_IFMT __S_IFMT # define S_IFDIR __S_IFDIR diff --git a/io/sys/stat.h b/io/sys/stat.h index c21801d6a9..de9b5e8064 100644 --- a/io/sys/stat.h +++ b/io/sys/stat.h @@ -104,7 +104,10 @@ typedef __blksize_t blksize_t; __BEGIN_DECLS -#include <bits/stat.h> +#ifndef __bits_stat_h_included +# include <bits/stat.h> +# define __bits_stat_h_included +#endif #if defined __USE_BSD || defined __USE_MISC || defined __USE_XOPEN # define S_IFMT __S_IFMT |