Merge branch 'master' into feature/api-mpfr

2 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e1072ef7..0a391e15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* mpfr.c (mpg_format_val): Set STRCUR flag when we're done.
 	Fixes a memory leak. Thanks to valgrind for the report.
 
+	* builtin.c (do_dcgettext): Move declaration of reslen to
+	outside the ifdefs. Thanks to Hermann Peifer for the report.
+
 	* gawkapi.c (awk_value_to_node): Initialize ext_ret_val to NULL
 	to avoid compiler warnings.
 
diff --git a/builtin.c b/builtin.c
index a0db2e4d..b3587630 100644
--- a/builtin.c
+++ b/builtin.c
@@ -3789,11 +3789,11 @@ do_dcgettext(int nargs)
 	NODE *tmp, *t1, *t2 = NULL;
 	char *string;
 	char *the_result;
+	size_t reslen;
 #if ENABLE_NLS && defined(LC_MESSAGES) && HAVE_DCGETTEXT
 	int lc_cat;
 	char *domain;
 	char save1, save2;
-	size_t reslen;
 
 	if (nargs == 3) {	/* third argument */
 		tmp = POP_STRING();