Merge branch 'gawk-4.1-stable'

3 files changed, 6 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 33f2d317..9cdaf0b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkgram.y: Minor whitespace cleanup, remove redundant ifdef.
+
 2013-06-24         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* dfa.c (copytoks): Rewrite to call addtok_mb() directly. Avoids
diff --git a/awkgram.c b/awkgram.c
index 10fd4215..947f4a30 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -2603,7 +2603,7 @@ yyreduce:
 			(yyval) = list_prepend(ip, (yyvsp[(1) - (8)]));
 			bcfree((yyvsp[(4) - (8)]));
 		} /* else
-				$1 and $4 are NULLs */
+			$1 and $4 are NULLs */
 	  }
     break;
 
@@ -7940,10 +7940,8 @@ add_lint(INSTRUCTION *list, LINTTYPE linttype)
 				;
 
 			if (do_lint) {		/* compile-time warning */
-#ifndef NO_LINT
 				if (isnoeffect(ip->opcode))
 					lintwarn_ln(ip->source_line, ("statement may have no effect"));
-#endif
 			}
 
 			if (ip->opcode == Op_push) {		/* run-time warning */
diff --git a/awkgram.y b/awkgram.y
index 68647229..f0ff4f0c 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -650,7 +650,7 @@ statement
 			$$ = list_prepend(ip, $1);
 			bcfree($4);
 		} /* else
-				$1 and $4 are NULLs */
+			$1 and $4 are NULLs */
 	  }
 	| LEX_FOR '(' NAME LEX_IN simple_variable r_paren opt_nls statement
 	  {
@@ -5392,10 +5392,8 @@ add_lint(INSTRUCTION *list, LINTTYPE linttype)
 				;
 
 			if (do_lint) {		/* compile-time warning */
-#ifndef NO_LINT
 				if (isnoeffect(ip->opcode))
 					lintwarn_ln(ip->source_line, ("statement may have no effect"));
-#endif
 			}
 
 			if (ip->opcode == Op_push) {		/* run-time warning */