From a445a0b0ce9bc97596d5d38931ecae5b0c0f0e6d Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Thu, 15 May 2003 01:04:07 +0000 Subject: [PATCH] * include/ddk/ndis.h (NDIS30_MINIPORT_CHARACTERISTICS_S): Unname anonymous unions if NONAMELESSUNION not defined. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/ddk/ndis.h | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index c6ee02618..6a8f9de41 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2003-05-15 Danny Smith + + * include/ddk/ndis.h (NDIS30_MINIPORT_CHARACTERISTICS_S): + Unname anonymous unions if NONAMELESSUNION not defined. + 2003-05-14 Bang Jun-Young * include/winbase.h (GMEM_VALID_FLAGS): Add. diff --git a/winsup/w32api/include/ddk/ndis.h b/winsup/w32api/include/ddk/ndis.h index 1264d4365..a1133f918 100644 --- a/winsup/w32api/include/ddk/ndis.h +++ b/winsup/w32api/include/ddk/ndis.h @@ -3720,15 +3720,15 @@ typedef NDIS_STATUS DDKAPI W_QUERY_INFORMATION_HANDLER QueryInformationHandler; \ W_RECONFIGURE_HANDLER ReconfigureHandler; \ W_RESET_HANDLER ResetHandler; \ - union { \ + _ANONYMOUS_UNION union { \ W_SEND_HANDLER SendHandler; \ WM_SEND_HANDLER WanSendHandler; \ - } u1; \ + } _UNION_NAME(u1); \ W_SET_INFORMATION_HANDLER SetInformationHandler; \ - union { \ + _ANONYMOUS_UNION union { \ W_TRANSFER_DATA_HANDLER TransferDataHandler; \ WM_TRANSFER_DATA_HANDLER WanTransferDataHandler; \ - } u2; + } _UNION_NAME(u2); typedef struct _NDIS30_MINIPORT_CHARACTERISTICS { NDIS30_MINIPORT_CHARACTERISTICS_S;