Make gawk_mb_cur_max compile time constant if no mbs support.

3 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6bf7901a..f1a8a8b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-04         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awk.h, main.c (gawk_mb_cur_max): Make it a constant 1 when
+	MBS_SUPPORT isn't available to allow GCC dead code constant
+	expression computation and dead code elimination to help out.
+
 2011-10-02         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* io.c (rsnullscan, get_a_record): Fix the cases where terminators
diff --git a/awk.h b/awk.h
index 2f3ccddc..0c954723 100644
--- a/awk.h
+++ b/awk.h
@@ -935,7 +935,7 @@ extern int do_lint_old;
 #if MBS_SUPPORT
 extern int gawk_mb_cur_max;
 #else
-extern const int gawk_mb_cur_max;
+#define gawk_mb_cur_max	(1)
 #endif
 
 #if defined (HAVE_GETGROUPS) && defined(NGROUPS_MAX) && NGROUPS_MAX > 0
diff --git a/main.c b/main.c
index 66d4b9b6..43a3e4a5 100644
--- a/main.c
+++ b/main.c
@@ -150,8 +150,6 @@ int use_lc_numeric = FALSE;	/* obey locale for decimal point */
 
 #if MBS_SUPPORT
 int gawk_mb_cur_max;		/* MB_CUR_MAX value, see comment in main() */
-#else
-const int gawk_mb_cur_max = 1;
 #endif
 
 FILE *output_fp;		/* default output for debugger */