Bash-5.0 patch 6: allow building with SYSLOG_HISTORY defined without defining SYSLOG_SHOPT

2019-04-20 14:27:00 -04:00
parent 41f5420db7
commit dfd2cc6ac5
2 changed files with 2 additions and 2 deletions
--- a/builtins/shopt.def
+++ b/builtins/shopt.def
@@ -122,7 +122,7 @@ extern int assoc_expand_once;
 extern int array_expand_once;
 #endif

-#if defined (SYSLOG_HISTORY) && defined (SYSLOG_SHOPT)
+#if defined (SYSLOG_HISTORY)
 extern int syslog_history;
 #endif

--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
   regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
   looks for to find the patch level (for the sccs version string). */

-#define PATCHLEVEL 5
+#define PATCHLEVEL 6

 #endif /* _PATCHLEVEL_H_ */