bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-23 18:45:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use poll with nfds_t type

Browse Source 
Clang 16 makes -Wincompatible-function-pointer-types an error by
default, which causes build failure for `(*_poll)` function because
`nfds_t` does not need to be equivalent to `unsigned int`. This commit
changes it in all poll function definitions and prototypes to `nfds_t`
as it is defined by POSIX and defines `nfds_t` type as `unsigned int`
when `WITH_POLL` is not defined.

Fixes: https://github.com/3proxy/3proxy/issues/895
See-also: https://bugs.gentoo.org/881015
This commit is contained in:
Petr Vaněk 2023-03-21 14:10:47 +01:00
parent 862405bdfd
commit fa7cdf2a5b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.c
View File

@ -157,7 +157,7 @@ int
WINAPI WINAPI
#endif #endif
mypoll(struct mypollfd *fds, unsigned int nfds, int timeout){ mypoll(struct mypollfd *fds, nfds_t nfds, int timeout){
fd_set readfd; fd_set readfd;
fd_set writefd; fd_set writefd;
fd_set oobfd; fd_set oobfd;

7
src/structures.h
View File

@ -69,6 +69,7 @@ int mutex_unlock(int *val);
#ifdef WITH_POLL #ifdef WITH_POLL
#include <poll.h> #include <poll.h>
#else #else
typedef unsigned int nfds_t;
#ifdef WITH_WSAPOLL #ifdef WITH_WSAPOLL
#define poll(A,B,C) WSAPoll(A,B,C) #define poll(A,B,C) WSAPoll(A,B,C)
@ -84,7 +85,7 @@ int
#ifdef _WIN32 #ifdef _WIN32
WINAPI WINAPI
#endif #endif
mypoll(struct mypollfd *fds, unsigned int nfds, int timeout); mypoll(struct mypollfd *fds, nfds_t nfds, int timeout);
#ifndef POLLIN #ifndef POLLIN
#define POLLIN 1 #define POLLIN 1
#endif #endif
@ -701,7 +702,7 @@ struct sockfuncs {
int (WINAPI *_getsockname)(SOCKET s, struct sockaddr * name, int * namelen); int (WINAPI *_getsockname)(SOCKET s, struct sockaddr * name, int * namelen);
int (WINAPI *_getsockopt)(SOCKET s, int level, int optname, char * optval, int * optlen); int (WINAPI *_getsockopt)(SOCKET s, int level, int optname, char * optval, int * optlen);
int (WINAPI *_setsockopt)(SOCKET s, int level, int optname, const char *optval, int optlen); int (WINAPI *_setsockopt)(SOCKET s, int level, int optname, const char *optval, int optlen);
int (WINAPI *_poll)(struct pollfd *fds, unsigned int nfds, int timeout); int (WINAPI *_poll)(struct pollfd *fds, nfds_t nfds, int timeout);
int (WINAPI *_send)(SOCKET s, const char *msg, int len, int flags); int (WINAPI *_send)(SOCKET s, const char *msg, int len, int flags);
int (WINAPI *_sendto)(SOCKET s, const char *msg, int len, int flags, const struct sockaddr *to, int tolen); int (WINAPI *_sendto)(SOCKET s, const char *msg, int len, int flags, const struct sockaddr *to, int tolen);
int (WINAPI *_recv)(SOCKET s, char *buf, int len, int flags); int (WINAPI *_recv)(SOCKET s, char *buf, int len, int flags);
@ -718,7 +719,7 @@ struct sockfuncs {
int (*_getsockname)(SOCKET s, struct sockaddr * name, socklen_t * namelen); int (*_getsockname)(SOCKET s, struct sockaddr * name, socklen_t * namelen);
int (*_getsockopt)(SOCKET s, int level, int optname, void * optval, socklen_t * optlen); int (*_getsockopt)(SOCKET s, int level, int optname, void * optval, socklen_t * optlen);
int (*_setsockopt)(int s, int level, int optname, const void *optval, socklen_t optlen); int (*_setsockopt)(int s, int level, int optname, const void *optval, socklen_t optlen);
int (*_poll)(struct pollfd *fds, unsigned int nfds, int timeout); int (*_poll)(struct pollfd *fds, nfds_t nfds, int timeout);
size_t (*_send)(SOCKET s, const void *msg, size_t len, int flags); size_t (*_send)(SOCKET s, const void *msg, size_t len, int flags);
size_t (*_sendto)(SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen); size_t (*_sendto)(SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen);
size_t (*_recv)(SOCKET s, void *buf, size_t len, int flags); size_t (*_recv)(SOCKET s, void *buf, size_t len, int flags);