aboutsummaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2018-06-27 20:18:46 +0300
committerArnold D. Robbins <arnold@skeeve.com>2018-06-27 20:18:46 +0300
commit4a4af3ea7690f380f29b99c59219421ef979e343 (patch)
tree12bbdbe87369e7f13e482d9a016b188907c05316 /support
parent7f57d12c835729207aea12e22021efce1705e6a0 (diff)
parentffea4491ee78863f024b34106514b282e281576b (diff)
downloadegawk-4a4af3ea7690f380f29b99c59219421ef979e343.tar.gz
egawk-4a4af3ea7690f380f29b99c59219421ef979e343.tar.bz2
egawk-4a4af3ea7690f380f29b99c59219421ef979e343.zip
Merge branch 'gawk-4.2-stable'
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