From e078566cedd2305cf32d5462de6fa3be607989f4 Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Wed, 12 Sep 2001 14:08:53 +0000 Subject: 2001-09-11 Danny Smith * include/winnt.h (_[U]LARGE_INTEGER): Protect nameless struct with !defined(NONAMELESSUNION), rather than defined(_ANONYMOUS_STRUCT). (_REPARSE_DATA_BUFFER): Name union field DUMMYUNIONNAME. --- winsup/w32api/ChangeLog | 6 ++++++ winsup/w32api/include/winnt.h | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'winsup/w32api') diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 83a3457..791c90b 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2001-09-11 Danny Smith + + * include/winnt.h (_[U]LARGE_INTEGER): Protect nameless struct with + !defined(NONAMELESSUNION), rather than defined(_ANONYMOUS_STRUCT). + (_REPARSE_DATA_BUFFER): Name union field DUMMYUNIONNAME. + 2001-09-05 Danny Smith * include/wininet.h (InternetAutodial): Add prototype. diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 4994479..d042192 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -1705,12 +1705,12 @@ typedef union _LARGE_INTEGER { DWORD LowPart; LONG HighPart; } u; -#if defined(_ANONYMOUS_STRUCT) || defined(__cplusplus) +#if ! defined(NONAMELESSUNION) || defined(__cplusplus) struct { DWORD LowPart; LONG HighPart; }; -#endif /* _ANONYMOUS_STRUCT */ +#endif /* NONAMELESSUNION */ LONGLONG QuadPart; } LARGE_INTEGER, *PLARGE_INTEGER; typedef union _ULARGE_INTEGER { @@ -1718,12 +1718,12 @@ typedef union _ULARGE_INTEGER { DWORD LowPart; DWORD HighPart; } u; -#if defined(_ANONYMOUS_STRUCT) || defined(__cplusplus) +#if ! defined(NONAMELESSUNION) || defined(__cplusplus) struct { DWORD LowPart; DWORD HighPart; }; -#endif /* _ANONYMOUS_STRUCT */ +#endif /* NONAMELESSUNION */ ULONGLONG QuadPart; } ULARGE_INTEGER, *PULARGE_INTEGER; typedef LARGE_INTEGER LUID,*PLUID; @@ -2502,7 +2502,7 @@ typedef struct _REPARSE_DATA_BUFFER { struct { BYTE DataBuffer[1]; } GenericReparseBuffer; - }; + } DUMMYUNIONNAME; } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER; typedef struct _REPARSE_GUID_DATA_BUFFER { DWORD ReparseTag; -- cgit v1.1