Snap for 7256110 from 6811e9246a0e176189379bff266cc1beef64d214 to sc-release
Change-Id: I569b54aa7450a9d3599f1c4453a66fe8e12c472c
diff --git a/FIXES b/FIXES
index 82c8f8f..516458e 100644
--- a/FIXES
+++ b/FIXES
@@ -25,6 +25,10 @@
This file lists all bug fixes, changes, etc., made since the AWK book
was sent to the printers in August, 1987.
+February 15, 2021:
+ Small fix so that awk will compile again with g++. Thanks to
+ Arnold Robbins.
+
January 06, 2021:
Fix a decision bug with trailing stuff in lib.c:is_valid_number
after recent changes. Thanks to Ozan Yigit.
diff --git a/METADATA b/METADATA
index 8f9155d..49d2ed8 100644
--- a/METADATA
+++ b/METADATA
@@ -5,11 +5,11 @@
type: GIT
value: "https://github.com/onetrueawk/awk.git"
}
- version: "178f660b5a4fde6f39e8065185373166f55b6e0c"
+ version: "c0f4e97e4561ff42544e92512bbaf3d7d1f6a671"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 2
- day: 9
+ month: 4
+ day: 1
}
}
diff --git a/main.c b/main.c
index 2b1d64c..f393634 100644
--- a/main.c
+++ b/main.c
@@ -22,7 +22,7 @@
THIS SOFTWARE.
****************************************************************/
-const char *version = "version 20210106";
+const char *version = "version 20210215";
#define DEBUG
#include <stdio.h>
diff --git a/tran.c b/tran.c
index add9d85..c6ae890 100644
--- a/tran.c
+++ b/tran.c
@@ -418,7 +418,7 @@
return(vp->fval);
}
-static char *get_inf_nan(double d)
+static const char *get_inf_nan(double d)
{
if (isinf(d)) {
return (d < 0 ? "-inf" : "+inf");
@@ -432,7 +432,7 @@
{
char s[256];
double dtemp;
- char *p;
+ const char *p;
if ((vp->tval & (NUM | STR)) == 0)
funnyvar(vp, "read value of");
