aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2014-07-25 11:55:32 -0400
committerArnold D. Robbins <arnold@skeeve.com>2014-07-25 11:55:32 -0400
commitb223339f5b27d7deb0cd7e45f6f50624990fb336 (patch)
tree451ad3cdad7e74bb2106ff51e6d550bb7f7f95a0
parentc0bea6b83a4e9e8bd8fb1e7dc700a5cf1ec4c0c5 (diff)
parentc93614354db29e990db243a36c8030ad1c9ca1b7 (diff)
downloadegawk-b223339f5b27d7deb0cd7e45f6f50624990fb336.tar.gz
egawk-b223339f5b27d7deb0cd7e45f6f50624990fb336.tar.bz2
egawk-b223339f5b27d7deb0cd7e45f6f50624990fb336.zip
Merge branch 'gawk-4.1-stable'
-rw-r--r--ChangeLog5
-rw-r--r--main.c2
-rw-r--r--test/ChangeLog5
-rw-r--r--test/printhuge.awk2
-rw-r--r--test/printhuge.ok2
5 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index aaa09f3a..6acff889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * main.c (main): Add a warning message if -M is used and gawk was
+ compiled without MPFR/GMP.
+
2014-07-24 Arnold D. Robbins <arnold@skeeve.com>
* main.c (usage): Put text for `-n' *after* text for `-m'.
diff --git a/main.c b/main.c
index a7ff5f5d..d8acedaa 100644
--- a/main.c
+++ b/main.c
@@ -472,6 +472,8 @@ main(int argc, char **argv)
case 'M':
#ifdef HAVE_MPFR
do_flags |= DO_MPFR;
+#else
+ warning(_("-M ignored: MPFR/GMP support not compiled in"));
#endif
break;
diff --git a/test/ChangeLog b/test/ChangeLog
index 79e2d538..ed673d8c 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * printhuge.awk: Add a newline to output.
+ * printhuge.ok: Adjust.
+
2014-07-24 Arnold D. Robbins <arnold@skeeve.com>
* badargs.ok: Adjust after correctly alphabetizing options.
diff --git a/test/printhuge.awk b/test/printhuge.awk
index 4d4fb7d4..1de27ecc 100644
--- a/test/printhuge.awk
+++ b/test/printhuge.awk
@@ -1,3 +1,3 @@
BEGIN {
- printf("%c", sprintf("%c", (0xffffff00+255)))
+ printf("%c\n", sprintf("%c", (0xffffff00+255)))
}
diff --git a/test/printhuge.ok b/test/printhuge.ok
index ce542efa..29e181eb 100644
--- a/test/printhuge.ok
+++ b/test/printhuge.ok
@@ -1 +1 @@
-ÿ \ No newline at end of file
+ÿ