diff options
| author |  Calvin Rose <calsrose@gmail.com> | 2019-12-31 09:49:50 -0500 |
|---|---|---|
| committer | Calvin Rose <calsrose@gmail.com> | 2019-12-31 09:49:50 -0500 |
| commit | 3a47ad5d9975e7eeff7e000f5a75db5a9e53b784 (patch) | |
| tree | 453a29ff9ddfdafbe37721eec7be5453fe87aa5f /tools | |
| parent | Update to NSIS 3.05 (diff) | |
Remove some NSIS cruft to see if we can fix 3.05
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/EnvVarUpdate.nsh | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/tools/EnvVarUpdate.nsh b/tools/EnvVarUpdate.nsh index 80c12cd8..54a804d7 100644 --- a/tools/EnvVarUpdate.nsh +++ b/tools/EnvVarUpdate.nsh @@ -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
\ No newline at end of file +!endif |