From 667abcff946fb1548cdaebc179545c578b60d3c5 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 8 Dec 2015 01:54:30 +0000
Subject: [PATCH] Kill warning with a cast in Ansi version of
 RunChildProcessRedirected. CppUnit still uses Ansi util.cpp?

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6662 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/exehead/util.c | 4 ++++
 Source/exehead/util.h | 2 +-
 Source/util.cpp       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Source/exehead/util.c b/Source/exehead/util.c
index c97d105a..e9152139 100644
--- a/Source/exehead/util.c
+++ b/Source/exehead/util.c
@@ -1105,9 +1105,11 @@ struct MGA_FUNC MGA_FUNCS[] = {
   {"SHELL32", (CHAR*) 680}, // IsUserAnAdmin
   {"SHLWAPI",  "SHAutoComplete"},
   {"SHFOLDER", "SHGetFolderPathW"},
+#ifdef NSIS_SUPPORT_GETDLLVERSION
   {"VERSION",  "GetFileVersionInfoSizeW"},
   {"VERSION",  "GetFileVersionInfoW"},
   {"VERSION",  "VerQueryValueW"}
+#endif
 };
 #else
   {"KERNEL32", "SetDefaultDllDirectories"},
@@ -1118,9 +1120,11 @@ struct MGA_FUNC MGA_FUNCS[] = {
   {"SHELL32", (CHAR*) 680}, // IsUserAnAdmin
   {"SHLWAPI",  "SHAutoComplete"},
   {"SHFOLDER", "SHGetFolderPathA"},
+#ifdef NSIS_SUPPORT_GETDLLVERSION
   {"VERSION",  "GetFileVersionInfoSizeA"},
   {"VERSION",  "GetFileVersionInfoA"},
   {"VERSION",  "VerQueryValueA"}
+#endif
 };
 #endif
 
diff --git a/Source/exehead/util.h b/Source/exehead/util.h
index 3de510a4..e09898fb 100644
--- a/Source/exehead/util.h
+++ b/Source/exehead/util.h
@@ -126,7 +126,7 @@ void NSISCALL mini_memcpy(void *out, const void *in, UINT_PTR cb);
 #endif
 
 enum myGetProcAddressFunctions {
-  MGA_SetDefaultDllDirectories, // Win8+ but exists on Vista/2008/7/2008R2 if KB2533623 is installed
+  MGA_SetDefaultDllDirectories, // Win8+ but also exists on Vista/2008/7/2008R2 if KB2533623 is installed
 #ifndef _WIN64
   MGA_GetDiskFreeSpaceEx,
   MGA_GetUserDefaultUILanguage,
diff --git a/Source/util.cpp b/Source/util.cpp
index 6474be03..c3f66b5e 100644
--- a/Source/util.cpp
+++ b/Source/util.cpp
@@ -967,7 +967,7 @@ int RunChildProcessRedirected(LPCSTR cmd)
 {
   STARTUPINFO si = { sizeof(STARTUPINFO), };
   PROCESS_INFORMATION pi;
-  if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
+  if (!CreateProcess(NULL, const_cast<LPSTR>(cmd), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
     return GetLastError();
   WaitForSingleObject(pi.hProcess, INFINITE);
   GetExitCodeProcess(pi.hProcess, &si.cb);