From 78c2af094e0d335621bb9bae73b4f5ffb13a2e72 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Tue, 9 Jan 2018 16:24:42 -0800
Subject: [PATCH] ircd::util: Extend return value in syscall() suite.

---
 include/ircd/util.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/ircd/util.h b/include/ircd/util.h
index 45c76d28f..a4214422c 100644
--- a/include/ircd/util.h
+++ b/include/ircd/util.h
@@ -641,15 +641,15 @@ struct values
 // Error-checking closure for POSIX system calls. Note the usage is
 // syscall(read, foo, bar, baz) not a macro like syscall(read(foo, bar, baz));
 //
-template<int ERROR_CODE = -1,
+template<long ERROR_CODE = -1,
          class function,
          class... args>
 auto
 syscall(function&& f,
         args&&... a)
--> typename std::enable_if<std::is_same<int, decltype(f(a...))>::value, int>::type
+-> typename std::enable_if<std::is_convertible<long, decltype(f(a...))>::value, long>::type
 {
-	const int ret
+	const auto ret
 	{
 		f(std::forward<args>(a)...)
 	};
@@ -664,15 +664,15 @@ syscall(function&& f,
 // Error-checking closure for POSIX system calls. Note the usage is
 // syscall(read, foo, bar, baz) not a macro like syscall(read(foo, bar, baz));
 //
-template<int ERROR_CODE = -1,
+template<long ERROR_CODE = -1,
          class function,
          class... args>
 auto
 uninterruptible_syscall(function&& f,
                         args&&... a)
--> typename std::enable_if<std::is_same<int, decltype(f(a...))>::value, int>::type
+-> typename std::enable_if<std::is_convertible<long, decltype(f(a...))>::value, long>::type
 {
-	int ret; do
+	long ret; do
 	{
 		ret = f(std::forward<args>(a)...);
 	}