From 10823fcdbc07b5ee937591eaa962d154093e5a90 Mon Sep 17 00:00:00 2001 From: David Cole <david.cole@kitware.com> Date: Mon, 10 Jan 2011 08:30:27 -0500 Subject: [PATCH] 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. --- SystemTools.cxx | 4 ++-- kwsysDateStamp.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SystemTools.cxx b/SystemTools.cxx index ab90db3..eefa7f5 100644 --- a/SystemTools.cxx +++ b/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; diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake index c23d0b3..4545c42 100644 --- a/kwsysDateStamp.cmake +++ b/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2011) SET(KWSYS_DATE_STAMP_MONTH 01) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 07) +SET(KWSYS_DATE_STAMP_DAY 10) -- GitLab