26 lines
701 B
Diff
26 lines
701 B
Diff
|
diff --git a/builtins/shopt.def b/builtins/shopt.def
|
||
|
|
index f6dc6f9..1c48536 100644
|
||
|
|
--- 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
|
||
|
|
|
||
|
|
diff --git a/patchlevel.h b/patchlevel.h
|
||
|
|
index 1bc098b..14bff9f 100644
|
||
|
|
--- 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_ */
|