From 774f3d50de487e287aeadd5bbeb3e5e1df3023f8 Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 30 Nov 2003 16:44:06 +0000 Subject: [PATCH] !ifmacro[n]def based now works with !else git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3235 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/script.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/script.cpp b/Source/script.cpp index 545dd012..97a1115e 100644 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -342,11 +342,11 @@ parse_again: line.eattoken(); - int v=line.gettoken_enum(0,"ifdef\0ifndef\0"); + int v=line.gettoken_enum(0,"ifdef\0ifndef\0ifmacrodef\0ifmacrondef\0"); if (v < 0) PRINTHELP() if (line.getnumtokens() == 1) PRINTHELP() - if (!v) tkid = TOK_P_IFDEF; - else tkid = TOK_P_IFNDEF; + int cmds[] = {TOK_P_IFDEF, TOK_P_IFNDEF, TOK_P_IFMACRODEF, TOK_P_IFMACRONDEF}; + tkid = cmds[v]; if_from_else++; }