From 0a0795dd5a2cf7b6bb29744244ba243db45c23ed Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 19 Sep 2021 18:24:24 +0000
Subject: [PATCH] Fixed types for POSIX

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

diff --git a/Source/ResourceEditor.cpp b/Source/ResourceEditor.cpp
index b5c54466..8178772e 100644
--- a/Source/ResourceEditor.cpp
+++ b/Source/ResourceEditor.cpp
@@ -43,7 +43,7 @@ static void FreeUnicodeResString(WINWCHAR* s) {
   if (!IS_INTRESOURCE(s) && FIRSTRESDIRSTRADDRESS != (WINWCHAR*) s)
     free(s);
 }
-static WINWCHAR* ResStringToUnicode(const char *s) {
+static WINWCHAR* ResStringToUnicode(const TCHAR *s) {
   if (IS_INTRESOURCE(s)) return MAKEINTRESOURCEWINW((ULONG_PTR)s);
   if (FIRSTRESDIRSTRADDRESS == (WINWCHAR*) s) return (WINWCHAR*) s;
   WINWCHAR *ws = WinWStrDupFromTChar(s);
@@ -892,7 +892,7 @@ bool CResourceEditor::AddExtraIconFromFile(const WINWCHAR* Type, WINWCHAR* Name,
 }
 
 template<class C, class P> static bool Contains(C&Map, P*p) {
-  return p && (SIZE_T) Map.base <= (SIZE_T) p && (SIZE_T) Map.base + Map.size > (SIZE_T) p;
+  return p && (size_t) Map.base <= (size_t) p && (size_t) Map.base + Map.size > (size_t) p;
 }
 
 void CResourceEditor::FreeExternal(EXTERNAL&X) {
@@ -925,7 +925,7 @@ const TCHAR* CResourceEditor::MapExternal(const TCHAR*File, TYPEMANIPULATION Man
         CResourceDataEntry*pRE = re.FindResourceT(X.RT, X.RN, X.RL, 0, &pNRDE, &pLRDE);
         if (pRE) {
           const WINWCHAR *wrn = pNRDE->GetNameOrId();
-          if (firstname) X.RN = IS_INTRESOURCE(wrn) ? MAKEINTRESOURCE((size_t) wrn) : _T("");
+          if (firstname) X.RN = IS_INTRESOURCE(wrn) ? (TCHAR*)(size_t) wrn : _T("");
           X.RL = pLRDE->GetId();
           ofs = pRE->GetOffset(), siz = pRE->GetSize();
         }
diff --git a/Source/icon.cpp b/Source/icon.cpp
index 74b635f6..f70dfbf3 100644
--- a/Source/icon.cpp
+++ b/Source/icon.cpp
@@ -71,7 +71,7 @@ void free_loaded_icon(IconGroup&icon)
   icon.clear();
 }
 
-IconGroup load_icon_res(CResourceEditor* re, const TCHAR*RT, WORD RN, LANGID RL)
+IconGroup load_icon_res(CResourceEditor* re, LPWSTR RT, WORD RN, LANGID RL)
 {
   IconGroupHeader* header;
   IconGroup result;