Remove some NSIS cruft to see if we can fix 3.05

This commit is contained in:
Calvin Rose 2019-12-31 09:49:50 -05:00
parent e3c88295f2
commit 3a47ad5d99
1 changed files with 1 additions and 16 deletions

View File

@ -35,21 +35,6 @@
!include "WinMessages.NSH"
!include "StrFunc.nsh"
; ---- Fix for conflict if StrFunc.nsh is already includes in main file -----------------------
!macro _IncludeStrFunction StrFuncName
!ifndef ${StrFuncName}_INCLUDED
${${StrFuncName}}
!endif
!ifndef Un${StrFuncName}_INCLUDED
${Un${StrFuncName}}
!endif
!define un.${StrFuncName} "${Un${StrFuncName}}"
!macroend
!insertmacro _IncludeStrFunction StrTok
!insertmacro _IncludeStrFunction StrStr
!insertmacro _IncludeStrFunction StrRep
; ---------------------------------- Macro Definitions ----------------------------------------
!macro _EnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString
Push "${EnvVarName}"
@ -324,4 +309,4 @@ FunctionEnd
;----------------------------------- EnvVarUpdate end----------------------------------------
!verbose pop
!endif
!endif