From 0a17affe37eac3c3a03de3db874300006fc90436 Mon Sep 17 00:00:00 2001 From: icemank Date: Sun, 16 Oct 2005 12:52:04 +0000 Subject: [PATCH] Fixed #ifdef blocks. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4330 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/lineparse.cpp | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/Source/lineparse.cpp b/Source/lineparse.cpp index 0cee0599..9a735229 100644 --- a/Source/lineparse.cpp +++ b/Source/lineparse.cpp @@ -124,25 +124,9 @@ void LineParser::freetokens() int LineParser::doline(char *line, int ignore_escaping/*=0*/) { m_nt=0; -#ifndef NSIS_FIX_COMMENT_HANDLING - if ( m_bCommentBlock ) - { - while ( *line ) - { - if ( *line == '*' && *(line+1) == '/' ) - { - m_bCommentBlock=false; // Found end of comment block - line+=2; - break; - } - line++; - } - } -#endif while (*line == ' ' || *line == '\t') line++; while (*line) { -#ifdef NSIS_FIX_COMMENT_HANDLING if ( m_bCommentBlock ) { while ( *line ) @@ -158,20 +142,14 @@ int LineParser::doline(char *line, int ignore_escaping/*=0*/) } } else { -#endif int lstate=0; // 1=", 2=`, 4=' if (*line == ';' || *line == '#') break; if (*line == '/' && *(line+1) == '*') { m_bCommentBlock = true; line+=2; -#ifndef NSIS_FIX_COMMENT_HANDLING - return doline(line, ignore_escaping); -#endif } -#ifdef NSIS_FIX_COMMENT_HANDLING else { -#endif if (*line == '\"') lstate=1; else if (*line == '\'') lstate=2; else if (*line == '`') lstate=4; @@ -224,10 +202,8 @@ int LineParser::doline(char *line, int ignore_escaping/*=0*/) else return -2; } while (*line == ' ' || *line == '\t') line++; -#ifdef NSIS_FIX_COMMENT_HANDLING } } -#endif } return 0; }