From e693472b16196d24ec4c53f1f4baf550f28f5c48 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Mon, 7 Feb 2005 20:18:08 +0000 Subject: [PATCH] 2005-02-07 Danny Smith * include/sys/stat.h (struct stat): Guard with _NO_OLDNAMES. * include/wchar.h (struct stat): Likwwise. Bug reported to Debian by Anand Kumria * include/sys/stat.h: Remove empty __STRICT_ANSI__ guard. --- winsup/mingw/ChangeLog | 8 ++++++++ winsup/mingw/include/sys/stat.h | 5 +++-- winsup/mingw/include/wchar.h | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index b4010be22..0c8d560fe 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,11 @@ +2005-02-07 Danny Smith + + * include/sys/stat.h (struct stat): Guard with _NO_OLDNAMES. + * include/wchar.h (struct stat): Likwwise. + Bug reported to Debian by Anand Kumria + + * include/sys/stat.h: Remove empty __STRICT_ANSI__ guard. + 2005-02-01 Danny Smith * mingwex/strtold.c (__asctoe64): Set endptr to 'e' if exponent diff --git a/winsup/mingw/include/sys/stat.h b/winsup/mingw/include/sys/stat.h index 03d02fc2c..e0d01eb11 100644 --- a/winsup/mingw/include/sys/stat.h +++ b/winsup/mingw/include/sys/stat.h @@ -26,8 +26,6 @@ /* * Constants for the stat st_mode member. */ -#ifndef __STRICT_ANSI__ -#endif #define _S_IFIFO 0x1000 /* FIFO */ #define _S_IFCHR 0x2000 /* Character */ #define _S_IFBLK 0x3000 /* Block: Is this ever set under w32? */ @@ -101,6 +99,8 @@ struct _stat time_t st_ctime; /* Creation time */ }; +#ifndef _NO_OLDNAMES +/* NOTE: Must be the same as _stat above. */ struct stat { _dev_t st_dev; /* Equivalent to drive number 0=A 1=B ... */ @@ -116,6 +116,7 @@ struct stat time_t st_mtime; /* Modified time */ time_t st_ctime; /* Creation time */ }; +#endif /* _NO_OLDNAMES */ #if defined (__MSVCRT__) struct _stati64 { diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h index a37750854..125160a09 100644 --- a/winsup/mingw/include/wchar.h +++ b/winsup/mingw/include/wchar.h @@ -386,6 +386,8 @@ struct _stat time_t st_ctime; /* Creation time */ }; +#ifndef _NO_OLDNAMES +/* NOTE: Must be the same as _stat above. */ struct stat { _dev_t st_dev; /* Equivalent to drive number 0=A 1=B ... */ @@ -401,6 +403,7 @@ struct stat time_t st_mtime; /* Modified time */ time_t st_ctime; /* Creation time */ }; +#endif /* _NO_OLDNAMES */ #if defined (__MSVCRT__) struct _stati64 {