[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: inferior: Adjust for Guile 2.0.
|
From: |
Ludovic Courtès |
|
Subject: |
01/05: inferior: Adjust for Guile 2.0. |
|
Date: |
Tue, 21 Aug 2018 17:29:59 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit a81b59b1bf99255cf78d736c3d2aa28eb1e9bbdf
Author: Ludovic Courtès <address@hidden>
Date: Tue Aug 21 14:28:03 2018 +0200
inferior: Adjust for Guile 2.0.
Partly fixes <https://bugs.gnu.org/32326>.
Reported by Michael Bowcutt <address@hidden>.
* guix/inferior.scm (open-inferior): Wrap 'setvbuf' call in 'cond-expand'.
---
guix/inferior.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/guix/inferior.scm b/guix/inferior.scm
index 629c2c4..05c8d65 100644
--- a/guix/inferior.scm
+++ b/guix/inferior.scm
@@ -87,7 +87,10 @@ equivalent. Return #f if the inferior could not be
launched."
(define pipe
(inferior-pipe directory command))
- (setvbuf pipe _IOLBF)
+ (cond-expand
+ ((and guile-2 (not guile-2.2)) #t)
+ (else (setvbuf pipe 'line)))
+
(match (read pipe)
(('repl-version 0 rest ...)
(let ((result (inferior 'pipe pipe (cons 0 rest))))