dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added P<, P<=, P=, P<>, P>= and P> LogicLib ptrdiff_t tests

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6445 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-03-04 19:00:09 +00:00
parent a7076ff238
commit ac873f36cb
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Include/LogicLib.nsh
View file

@ -52,6 +52,8 @@
; a U< b; a U>= b; a U> b; a U<= b
; 64-bit integer tests (using System.dll):
; a L= b; a L<> b; a L< b; a L>= b; a L> b; a L<= b
; ptrdiff_t integer tests
; a P= b; a P<> b; a P< b; a P>= b; a P> b; a P<= b
; Built-in NSIS flag tests:
; ${Abort}; ${Errors}; ${RebootFlag}; ${Silent}
; Built-in NSIS other tests:
@ -250,6 +252,33 @@
!insertmacro _L> `${_a}` `${_b}` `${_f}` `${_t}`
!macroend
; ptrdiff_t tests
!macro LogicLib_PtrDiffTest _o _a _b _t _f
!if ${NSIS_PTR_SIZE} <= 4
!insertmacro _${_o} `${_a}` `${_b}` `${_t}` `${_f}`
!else
!insertmacro _L${_o} `${_a}` `${_b}` `${_t}` `${_f}`
!endif
!macroend
!macro _P= _a _b _t _f
!insertmacro LogicLib_PtrDiffTest = `${_a}` `${_b}` `${_t}` `${_f}`
!macroend
!macro _P<> _a _b _t _f
!insertmacro LogicLib_PtrDiffTest <> `${_a}` `${_b}` `${_t}` `${_f}`
!macroend
!macro _P< _a _b _t _f
!insertmacro LogicLib_PtrDiffTest < `${_a}` `${_b}` `${_t}` `${_f}`
!macroend
!macro _P>= _a _b _t _f
!insertmacro LogicLib_PtrDiffTest >= `${_a}` `${_b}` `${_t}` `${_f}`
!macroend
!macro _P> _a _b _t _f
!insertmacro LogicLib_PtrDiffTest > `${_a}` `${_b}` `${_t}` `${_f}`
!macroend
!macro _P<= _a _b _t _f
!insertmacro LogicLib_PtrDiffTest <= `${_a}` `${_b}` `${_t}` `${_f}`
!macroend
; Flag tests
!macro _Abort _a _b _t _f
IfAbort `${_t}` `${_f}`