git: 971677d5fd4c - main - sh: Avoid some headers when NO_HISTORY is set.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 Nov 2021 01:54:55 UTC
The branch main has been updated by bdrewery:
URL: https://cgit.FreeBSD.org/src/commit/?id=971677d5fd4cc6e776468cb80e0a05fdd3f4da49
commit 971677d5fd4cc6e776468cb80e0a05fdd3f4da49
Author: Bryan Drewery <bdrewery@FreeBSD.org>
AuthorDate: 2021-11-25 01:52:11 +0000
Commit: Bryan Drewery <bdrewery@FreeBSD.org>
CommitDate: 2021-11-25 01:53:39 +0000
sh: Avoid some headers when NO_HISTORY is set.
This is more simpler compatibility with using this source on older
systems before libedit was made to install filecomplete.h in
commit b315a7296d2.
---
bin/sh/input.c | 2 ++
bin/sh/trap.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 3933287524a4..12faa33d0f1b 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -59,7 +59,9 @@ __FBSDID("$FreeBSD$");
#include "error.h"
#include "alias.h"
#include "parser.h"
+#ifndef NO_HISTORY
#include "myhistedit.h"
+#endif
#include "trap.h"
#define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index 2dd394035ca4..7a6ed2f4368a 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -58,7 +58,9 @@ __FBSDID("$FreeBSD$");
#include "trap.h"
#include "mystring.h"
#include "builtins.h"
+#ifndef NO_HISTORY
#include "myhistedit.h"
+#endif
/*