From d81a3ea9a9e7bd49003215004c2b05bb9f902497 Mon Sep 17 00:00:00 2001 From: Massimiliano Gubinelli Date: Sat, 21 Mar 2020 19:40:33 +0000 Subject: fixes diff --git a/libguile/fports.c b/libguile/fports.c index 007ee3f..179c58d 100644 --- a/libguile/fports.c +++ b/libguile/fports.c @@ -594,7 +594,7 @@ fport_fill_input (SCM port) scm_t_port *pt = SCM_PTAB_ENTRY (port); scm_t_fport *fp = SCM_FSTREAM (port); -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && !defined(__HAIKU__) fport_wait_for_input (port); #endif /* !__MINGW32__ */ SCM_SYSCALL (count = read (fp->fdes, pt->read_buf, pt->read_buf_size)); diff --git a/libguile/posix.c b/libguile/posix.c index 2ecd8ae..fdaaad9 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -421,9 +421,9 @@ SCM_DEFINE (scm_getgrgid, "getgr", 0, 1, 0, return SCM_BOOL_F; } } - else if (scm_is_integer (name)) + else if (scm_is_integer (name)) { SCM_SYSCALL (entry = getgrgid (scm_to_int (name))); - else + } else STRING_SYSCALL (name, c_name, entry = getgrnam (c_name)); if (!entry) @@ -1236,14 +1236,14 @@ SCM_DEFINE (scm_utime, "utime", 1, 2, 0, int rv; struct utimbuf utm_tmp; - if (SCM_UNBNDP (actime)) + if (SCM_UNBNDP (actime)) { SCM_SYSCALL (time (&utm_tmp.actime)); - else + } else utm_tmp.actime = SCM_NUM2ULONG (2, actime); - if (SCM_UNBNDP (modtime)) + if (SCM_UNBNDP (modtime)) { SCM_SYSCALL (time (&utm_tmp.modtime)); - else + } else utm_tmp.modtime = SCM_NUM2ULONG (3, modtime); STRING_SYSCALL (pathname, c_pathname, -- 2.24.1