From c88694b86fb551db3f3d5ca40c15b4fc417ef9c4 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 25 Jan 2018 18:37:15 +0000
Subject: [PATCH] Only include WinVer Win9x code in 32-bit ANSI installers

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6970 212acab6-be3b-0410-9dea-997c60f758d6
---
 Include/WinVer.nsh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Include/WinVer.nsh b/Include/WinVer.nsh
index ad517f6e..c057b7b6 100644
--- a/Include/WinVer.nsh
+++ b/Include/WinVer.nsh
@@ -266,7 +266,8 @@
     IntOp $__WINVERSP $__WINVERSP | ${_WINVER_NTBIT}
     IntOp $__WINVERV  $__WINVERV  | ${_WINVER_NTBIT}
   _winver_notnt:
-
+!ifndef NSIS_UNICODE
+!if "${NSIS_PTR_SIZE}" <= 4
   # get service pack information
   IntCmp $0 ${VER_PLATFORM_WIN32_NT} _winver_nt "" _winver_nt  # win9x
 
@@ -294,7 +295,8 @@
     Goto _winver_sp_done
 
   _winver_nt: # nt
-
+!endif #~ 32-bit
+!endif #~ ANSI
     IntCmp $R0 ${OSVERSIONINFOEX_SIZE} "" _winver_sp_noex _winver_sp_noex
 
       # discard szCSDVersion