From cf55531aae1c579ceacb6b716fce826bb20d7f35 Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Sat, 21 Mar 2015 13:05:37 +0100
Subject: [PATCH] Make nfds_t size_t.

---
 kernel/include/sortix/kernel/syscall.h |  2 +-
 kernel/include/sortix/poll.h           |  4 ++--
 kernel/poll.cpp                        | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kernel/include/sortix/kernel/syscall.h b/kernel/include/sortix/kernel/syscall.h
index d98545b7..1b846e3d 100644
--- a/kernel/include/sortix/kernel/syscall.h
+++ b/kernel/include/sortix/kernel/syscall.h
@@ -117,7 +117,7 @@ int sys_mprotect(const void*, size_t, int);
 int sys_munmap(void*, size_t);
 int sys_openat(int, const char*, int, mode_t);
 int sys_pipe2(int*, int);
-int sys_ppoll(struct pollfd*, nfds_t, const struct timespec*, const sigset_t*);
+int sys_ppoll(struct pollfd*, size_t, const struct timespec*, const sigset_t*);
 ssize_t sys_pread(int, void*, size_t, off_t);
 ssize_t sys_preadv(int, const struct iovec*, int, off_t);
 int sys_prlimit(pid_t, int, const struct rlimit*, struct rlimit*);
diff --git a/kernel/include/sortix/poll.h b/kernel/include/sortix/poll.h
index cbccd894..4800aedb 100644
--- a/kernel/include/sortix/poll.h
+++ b/kernel/include/sortix/poll.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    Copyright(C) Jonas 'Sortie' Termansen 2012.
+    Copyright(C) Jonas 'Sortie' Termansen 2012, 2015.
 
     This file is part of Sortix.
 
@@ -29,7 +29,7 @@
 
 __BEGIN_DECLS
 
-typedef unsigned long int nfds_t;
+typedef __SIZE_TYPE__ nfds_t;
 
 struct pollfd
 {
diff --git a/kernel/poll.cpp b/kernel/poll.cpp
index 2f05dc2e..f4a324d5 100644
--- a/kernel/poll.cpp
+++ b/kernel/poll.cpp
@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    Copyright(C) Jonas 'Sortie' Termansen 2012, 2014.
+    Copyright(C) Jonas 'Sortie' Termansen 2012, 2014, 2015.
 
     This file is part of Sortix.
 
@@ -146,7 +146,7 @@ PollNode* PollNode::CreateSlave()
 	return slave = new_slave;
 }
 
-static struct pollfd* CopyFdsFromUser(struct pollfd* user_fds, nfds_t nfds)
+static struct pollfd* CopyFdsFromUser(struct pollfd* user_fds, size_t nfds)
 {
 	size_t size = sizeof(struct pollfd) * nfds;
 	struct pollfd* fds = new struct pollfd[nfds];
@@ -161,7 +161,7 @@ static struct pollfd* CopyFdsFromUser(struct pollfd* user_fds, nfds_t nfds)
 }
 
 static bool CopyFdsToUser(struct pollfd* user_fds,
-                          const struct pollfd* kernel_fds, nfds_t nfds)
+                          const struct pollfd* kernel_fds, size_t nfds)
 {
 	size_t size = sizeof(struct pollfd) * nfds;
 	return CopyToUser(user_fds, kernel_fds, size);
@@ -177,7 +177,7 @@ static bool FetchTimespec(struct timespec* dest, const struct timespec* user)
 	return true;
 }
 
-int sys_ppoll(struct pollfd* user_fds, nfds_t nfds,
+int sys_ppoll(struct pollfd* user_fds, size_t nfds,
               const struct timespec* user_timeout_ts,
               const sigset_t* user_sigmask)
 {
@@ -208,7 +208,7 @@ int sys_ppoll(struct pollfd* user_fds, nfds_t nfds,
 	volatile bool remote_woken = false;
 	bool unexpected_error = false;
 
-	nfds_t reqs;
+	size_t reqs;
 	for ( reqs = 0; !unexpected_error && reqs < nfds; )
 	{
 		PollNode* node = nodes + reqs;
@@ -252,14 +252,14 @@ int sys_ppoll(struct pollfd* user_fds, nfds_t nfds,
 
 	kthread_mutex_unlock(&wakeup_mutex);
 
-	for ( nfds_t i = 0; i < reqs; i++ )
+	for ( size_t i = 0; i < reqs; i++ )
 		if ( 0 <= fds[i].fd )
 			nodes[i].Cancel();
 
 	if ( !unexpected_error )
 	{
 		int num_events = 0;
-		for ( nfds_t i = 0; i < reqs; i++ )
+		for ( size_t i = 0; i < reqs; i++ )
 		{
 			if ( fds[i].fd < -1 )
 				continue;