[Cmake-commits] CMake branch, master, updated. v2.8.3-422-g6754b26
KWSys Robot
kwrobot at kitware.com
Mon Jan 10 08:40:08 EST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 6754b26bf0bb69ad6d65249bf4122dbbda446922 (commit)
from a300edab4132d73093deaf0987b6c4cf027dc2d5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6754b26bf0bb69ad6d65249bf4122dbbda446922
commit 6754b26bf0bb69ad6d65249bf4122dbbda446922
Author: David Cole <david.cole at kitware.com>
AuthorDate: Mon Jan 10 08:30:27 2011 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Mon Jan 10 08:40:03 2011 -0500
KWSys: Fix WOW64 registry mode on Windows 2000 (#10759)
The previous commit did not compile with mingw gcc.
Use the Windows type FARPROC instead of void* for
the local variable.
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index ab90db3..eefa7f5 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -564,8 +564,8 @@ static DWORD SystemToolsMakeRegistryMode(DWORD mode,
SystemTools::KeyWOW64 view)
{
// only add the modes when on a system that supports Wow64.
- static void *wow64p = GetProcAddress(GetModuleHandle("kernel32"),
- "IsWow64Process");
+ static FARPROC wow64p = GetProcAddress(GetModuleHandle("kernel32"),
+ "IsWow64Process");
if(wow64p == NULL)
{
return mode;
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/SystemTools.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list