From 93f57f68a22007770a66f467af24cb91123856f9 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 25 Jul 2025 16:34:10 +0200 Subject: [PATCH] os: xserver_poll: replace own typedef by size_t No need to have an own typedef here, just use standard size_t. Signed-off-by: Enrico Weigelt, metux IT consult --- os/xserver_poll.c | 8 ++++---- os/xserver_poll.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/os/xserver_poll.c b/os/xserver_poll.c index f44fc77bd3..c13fddd690 100644 --- a/os/xserver_poll.c +++ b/os/xserver_poll.c @@ -101,12 +101,12 @@ static int map_poll_spec (struct pollfd *pArray, - nfds_t n_fds, + size_t n_fds, fd_set *pReadSet, fd_set *pWriteSet, fd_set *pExceptSet) { - register nfds_t i; /* loop control */ + register size_t i; /* loop control */ register struct pollfd *pCur; /* current array element */ register int max_fd = -1; /* return value */ @@ -204,7 +204,7 @@ static struct timeval *map_timeout static void map_select_results (struct pollfd *pArray, - unsigned long n_fds, + size_t n_fds, fd_set *pReadSet, fd_set *pWriteSet, fd_set *pExceptSet) @@ -240,7 +240,7 @@ static void map_select_results \*---------------------------------------------------------------------------*/ int xserver_poll - (struct pollfd *pArray, unsigned long n_fds, int timeout) + (struct pollfd *pArray, size_t n_fds, int timeout) { fd_set read_descs; /* input file descs */ fd_set write_descs; /* output file descs */ diff --git a/os/xserver_poll.h b/os/xserver_poll.h index 0f3a37c736..b0ac6c7bc9 100644 --- a/os/xserver_poll.h +++ b/os/xserver_poll.h @@ -23,6 +23,8 @@ #ifndef _XSERVER_POLL_H_ #define _XSERVER_POLL_H_ +#include + #ifndef _DIX_CONFIG_H_ #error must include dix-config.h to use xserver_poll.h #endif @@ -46,9 +48,7 @@ struct pollfd short revents; }; -typedef unsigned long nfds_t; - -int xserver_poll (struct pollfd *pArray, nfds_t n_fds, int timeout); +int xserver_poll (struct pollfd *pArray, size_t n_fds, int timeout); #endif