diff options
author | Andreas Schwab <schwab@redhat.com> | 2010-01-11 10:31:49 +0100 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2010-01-11 10:31:49 +0100 |
commit | c14a0516dbea2e1b794f9a09a8ea182fbe0dc349 (patch) | |
tree | aea6ef619b1bb3ee704d5904f8209c33933c4822 /sysdeps/unix/bsd/bits/stat.h | |
parent | a5683508bcdcfcbe8e486cbcdcaa3830d9ab22e8 (diff) | |
parent | 33780b6d332af9d94216eff880734be7748c2269 (diff) |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'sysdeps/unix/bsd/bits/stat.h')
-rw-r--r-- | sysdeps/unix/bsd/bits/stat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/bsd/bits/stat.h b/sysdeps/unix/bsd/bits/stat.h index 84a58ffbc9..16e5c520fe 100644 --- a/sysdeps/unix/bsd/bits/stat.h +++ b/sysdeps/unix/bsd/bits/stat.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 96, 97, 99, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1996-2000,2010 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 @@ -16,7 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef _SYS_STAT_H +#if !defined _SYS_STAT_H && !defined _FCNTL_H # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." #endif |