aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog21
-rw-r--r--bisonfix.awk29
2 files changed, 26 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 887f8570..3db54e43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-12 Arnold D. Robbins <arnold@skeeve.com>
+
+ * bisonfix.awk: Comment out code for fixing contined #if
+ statements. It is likely not needed anymore. Leave it there in
+ case I'm wrong.
+
2013-02-06 Arnold D. Robbins <arnold@skeeve.com>
* builtin.c (printf_common): Move nargs > 0 check into assert.
@@ -8,6 +14,10 @@
* main.c (main): Remove undocumented -m option which was for
compatibility with BWK awk. His awk dropped it back in 2007.
+2013-02-03 Arnold D. Robbins <arnold@skeeve.com>
+
+ * configure.ac: Add Automake test for cross compiling.
+
2013-01-31 Arnold D. Robbins <arnold@skeeve.com>
* regcomp.c, regex.c, regex_internal.c, regexec.c: Update
@@ -21,25 +31,16 @@
(clean_state_log_if_needed): Likewise.
(get_subexp): Likewise.`
-<<<<<<< HEAD
-2013-02-03 Arnold D. Robbins <arnold@skeeve.com>
-
- * configure.ac: Add Automake test for cross compiling.
-
-=======
->>>>>>> gawk-4.0-stable
2013-01-31 Arnold D. Robbins <arnold@skeeve.com>
* dfa.c: Include "dfa.h" which includes regex.h after limits.h
so that RE_DUP_MAX gets the correct value. Especially needed on
OpenVMS. Thanks to Anders Wallin.
-<<<<<<< HEAD
+
* main.c (version): Print out API version numbers if DYNAMIC.
Helpful also for knowing if to run the shlib tests.
* configure: Regenerated after change in m4/readline.m4.
-=======
->>>>>>> gawk-4.0-stable
2013-01-31 Arnold D. Robbins <arnold@skeeve.com>
diff --git a/bisonfix.awk b/bisonfix.awk
index abb4f904..87fe9ee9 100644
--- a/bisonfix.awk
+++ b/bisonfix.awk
@@ -21,20 +21,21 @@
BEGIN { sfile = ARGV[1] ; ARGV[1] = "-" ; ARGC = 2 }
-/^#if.*\\$/ {
- line = $0
- sub(/\\$/, "", line)
- getline line2
- while (line2 ~ /\\$/) {
- line = line line2
- sub(/\\$/, "", line)
- getline line2
- }
- line = line line2
- sub(/\\$/, "", line)
- print line
- next
-}
+# 2/2013: Comment this out to see if any system still needs it.
+# /^#if.*\\$/ {
+# line = $0
+# sub(/\\$/, "", line)
+# getline line2
+# while (line2 ~ /\\$/) {
+# line = line line2
+# sub(/\\$/, "", line)
+# getline line2
+# }
+# line = line line2
+# sub(/\\$/, "", line)
+# print line
+# next
+# }
/^#line.*y\.tab\.c/ { sub(/y.tab/, sfile) }