Merge branch 'master' into feature/fix-comments

1 files changed, 12 insertions, 19 deletions

diff --git a/awkgram.c b/awkgram.c
index e3eca143..5b1679c7 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -7383,22 +7383,19 @@ check_funcs()
 
 	for (i = 0; i < HASHSIZE; i++) {
 		for (fp = ftable[i]; fp != NULL; fp = fp->next) {
-#ifdef REALLYMEAN
-			/* making this the default breaks old code. sigh. */
-			if (fp->defined == 0 && ! fp->extension) {
-				error(
-		_("function `%s' called but never defined"), fp->name);
-				errcount++;
-			}
-#else
-			if (do_lint && fp->defined == 0 && ! fp->extension)
-				lintwarn(
-		_("function `%s' called but never defined"), fp->name);
-#endif
+			if (do_lint && ! fp->extension) {
+				/*
+				 * Making this not a lint check and
+				 * incrementing * errcount breaks old code.
+				 * Sigh.
+				 */
+				if (fp->defined == 0)
+					lintwarn(_("function `%s' called but never defined"),
+						fp->name);
 
-			if (do_lint && fp->used == 0 && ! fp->extension) {
-				lintwarn(_("function `%s' defined but never called directly"),
-					fp->name);
+				if (fp->used == 0)
+					lintwarn(_("function `%s' defined but never called directly"),
+						fp->name);
 			}
 		}
 	}
@@ -8728,9 +8725,6 @@ install_builtins(void)
 bool
 is_alpha(int c)
 {
-#ifdef I_DONT_KNOW_WHAT_IM_DOING
-	return isalpha(c);
-#else /* ! I_DONT_KNOW_WHAT_IM_DOING */
 	switch (c) {
 	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
 	case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
@@ -8745,7 +8739,6 @@ is_alpha(int c)
 		return true;
 	}
 	return false;
-#endif /* ! I_DONT_KNOW_WHAT_IM_DOING */
 }
 
 /* is_alnum --- return true for alphanumeric, English only letters */