Alexandre Julliard : conhost: Use nameless union/structs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2e58c9e0605b3846d50c6bb09f4274f9324746ac
URL:    https://gitlab.winehq.org/wine/wine/-/commit/2e58c9e0605b3846d50c6bb09f4274f...

Author: Alexandre Julliard 
Date:   Fri Jun 16 17:56:55 2023 +0200

conhost: Use nameless union/structs.

---

programs/conhost/window.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/programs/conhost/window.c b/programs/conhost/window.c
index 0d6036f07d7..043ecd5510f 100644
--- a/programs/conhost/window.c
+++ b/programs/conhost/window.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#define NONAMELESSUNION
 #include <stdlib.h>

#include "conhost.h"
@@ -1924,15 +1923,15 @@ static BOOL config_dialog( struct console *console, BOOL current )
     psp.hInstance = wndclass.hInstance;
     psp.lParam = (LPARAM)&di;

-    psp.u.pszTemplate = MAKEINTRESOURCEW(IDD_OPTION);
+    psp.pszTemplate = MAKEINTRESOURCEW(IDD_OPTION);
     psp.pfnDlgProc = option_dialog_proc;
     pages[0] = CreatePropertySheetPageW( &psp );

-    psp.u.pszTemplate = MAKEINTRESOURCEW(IDD_FONT);
+    psp.pszTemplate = MAKEINTRESOURCEW(IDD_FONT);
     psp.pfnDlgProc = font_dialog_proc;
     pages[1] = CreatePropertySheetPageW( &psp );

-    psp.u.pszTemplate = MAKEINTRESOURCEW(IDD_CONFIG);
+    psp.pszTemplate = MAKEINTRESOURCEW(IDD_CONFIG);
     psp.pfnDlgProc = config_dialog_proc;
     pages[2] = CreatePropertySheetPageW( &psp );

@@ -1947,7 +1946,7 @@ static BOOL config_dialog( struct console *console, BOOL current )
     header.pszCaption = buff;
     header.nPages     = 3;
     header.hwndParent = console->win;
-    header.u3.phpage  = pages;
+    header.phpage     = pages;
     header.dwFlags    = PSH_NOAPPLYNOW;
     if (PropertySheetW( &header ) < 1)
         return TRUE;