-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi.
I just tried to compile setup.exe from source and run into a problem in
propsheet.cc. The names like PropSheet_SetCurSel() are macros and already
contain the `::' resulting into `::::' and compile error. The attached patch
fixes it for me. Changelog below.
- --
VH
2010-09-10 Václav Haisman <v.hais...@sh.cvut.cz>
* propsheet.cc (PropSheet::SetActivePage): Remove :: before
PropSheet_SetCurSel.
(PropSheet::SetActivePageByID): Remove :: before
PropSheet_SetCurSelByID.
(PropSheet::SetButtons): Remove :: before PropSheet_SetWizButtons.
(PropSheet::PressButton): Remove :: before PropSheet_PressButton.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iF4EAREIAAYFAkyLkMcACgkQeqrf2dJjGj41mQD8C6nc9hM8rBY9fdsvI6bV0OLb
aCliFrdPSSLJ66gIWUMA/0m4Fh3yUglWAv6vxmDwrHo28FWn+A7wbiLgzTOUm6yQ
=/PMJ
-----END PGP SIGNATURE-----
Index: propsheet.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/propsheet.cc,v
retrieving revision 2.15
diff -u -p -r2.15 propsheet.cc
--- propsheet.cc 30 Jun 2009 04:14:29 -0000 2.15
+++ propsheet.cc 11 Sep 2010 14:14:33 -0000
@@ -441,7 +441,7 @@ bool
PropSheet::SetActivePage (int i)
{
// Posts a message to the message queue, so this won't block
- return static_cast < bool > (::PropSheet_SetCurSel (GetHWND (), NULL, i));
+ return static_cast < bool > (PropSheet_SetCurSel (GetHWND (), NULL, i));
}
bool
@@ -449,18 +449,18 @@ PropSheet::SetActivePageByID (int resour
{
// Posts a message to the message queue, so this won't block
return static_cast < bool >
- (::PropSheet_SetCurSelByID (GetHWND (), resource_id));
+ (PropSheet_SetCurSelByID (GetHWND (), resource_id));
}
void
PropSheet::SetButtons (DWORD flags)
{
// Posts a message to the message queue, so this won't block
- ::PropSheet_SetWizButtons (GetHWND (), flags);
+ PropSheet_SetWizButtons (GetHWND (), flags);
}
void
PropSheet::PressButton (int button)
{
- ::PropSheet_PressButton (GetHWND (), button);
+ PropSheet_PressButton (GetHWND (), button);
}
propsheet.cc.diff.sig
Description: Binary data
