aboutsummaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2018-06-27 20:19:19 +0300
committerArnold D. Robbins <arnold@skeeve.com>2018-06-27 20:19:19 +0300
commit163c05980eaa4736ae800d3cb1ebcb84bf54ec9f (patch)
tree4c04d159e179070d7563858aeb1cab5edbebb0cc /support
parentf59bc1d895b5cc3d0dfad1ced3fc998ba5f7e976 (diff)
parent4a4af3ea7690f380f29b99c59219421ef979e343 (diff)
downloadegawk-163c05980eaa4736ae800d3cb1ebcb84bf54ec9f.tar.gz
egawk-163c05980eaa4736ae800d3cb1ebcb84bf54ec9f.tar.bz2
egawk-163c05980eaa4736ae800d3cb1ebcb84bf54ec9f.zip
Merge branch 'master' into feature/fix-comments
Diffstat (limited to 'support')
-rw-r--r--support/ChangeLog5
-rw-r--r--support/regex_internal.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/support/ChangeLog b/support/ChangeLog
index f0c5884a..f08d71a7 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-21 Arnold D. Robbins <arnold@skeeve.com>
+
+ * regex_internal.h: Simplify undefining inline and defining to empty.
+ Thanks to Florian Weimer <fweimer@redhat.com> for the suggestion.
+
2018-03-13 Arnold D. Robbins <arnold@skeeve.com>
* getopt.c: Update copyright year.
diff --git a/support/regex_internal.h b/support/regex_internal.h
index f97ecbe2..cdd6e3a1 100644
--- a/support/regex_internal.h
+++ b/support/regex_internal.h
@@ -111,9 +111,7 @@ is_blank (int c)
# define BE(expr, val) __builtin_expect (expr, val)
#else
# define BE(expr, val) (expr)
-# ifdef inline
# undef inline
-# endif
# define inline
#endif