Francois Gouget : appwiz.cpl: Fix compilation on systems that don' t support nameless unions.
Alexandre Julliard
julliard at winehq.org
Mon Jul 28 08:06:59 CDT 2008
Module: wine
Branch: master
Commit: a5ef61e0d312bcb12655ebff0d4793503a05c353
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ef61e0d312bcb12655ebff0d4793503a05c353
Author: Francois Gouget <fgouget at free.fr>
Date: Sat Jul 26 19:11:37 2008 +0200
appwiz.cpl: Fix compilation on systems that don't support nameless unions.
---
dlls/appwiz.cpl/appwiz.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c
index e06d810..6da1a77 100644
--- a/dlls/appwiz.cpl/appwiz.c
+++ b/dlls/appwiz.cpl/appwiz.c
@@ -23,6 +23,8 @@
*
*/
+#define NONAMELESSUNION
+
#include "config.h"
#include "wine/port.h"
#include "wine/unicode.h"
@@ -708,8 +710,8 @@ static void StartApplet(HWND hWnd)
psp.dwSize = sizeof (PROPSHEETPAGEW);
psp.dwFlags = PSP_USETITLE;
psp.hInstance = hInst;
- psp.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN);
- psp.pszIcon = NULL;
+ psp.u.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN);
+ psp.u2.pszIcon = NULL;
psp.pfnDlgProc = (DLGPROC) MainDlgProc;
psp.pszTitle = tab_title;
psp.lParam = 0;
@@ -719,12 +721,12 @@ static void StartApplet(HWND hWnd)
psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID;
psh.hwndParent = hWnd;
psh.hInstance = hInst;
- psh.pszIcon = NULL;
+ psh.u.pszIcon = NULL;
psh.pszCaption = app_title;
psh.nPages = 1;
- psh.ppsp = &psp;
+ psh.u3.ppsp = &psp;
psh.pfnCallback = NULL;
- psh.nStartPage = 0;
+ psh.u2.nStartPage = 0;
/* Display the property sheet */
PropertySheetW (&psh);
More information about the wine-cvs
mailing list