Merge pull request #843 from JacobBarthelmeh/shadow

example max() conflicts with toolchains max() function
pull/844/head
David Garske 2025-10-20 09:16:00 -07:00 committed by GitHub
commit 51414d681f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions

View File

@ -72,7 +72,7 @@
static const char defaultFwdFromHost[] = "0.0.0.0";
static inline int max(int a, int b)
static inline int findMax(int a, int b)
{
return (a > b) ? a : b;
}
@ -407,7 +407,7 @@ THREAD_RETURN WOLFSSH_THREAD portfwd_worker(void* args)
FD_ZERO(&templateFds);
FD_SET(sshFd, &templateFds);
FD_SET(listenFd, &templateFds);
nFds = max(sshFd, listenFd) + 1;
nFds = findMax(sshFd, listenFd) + 1;
for (;;) {
rxFds = templateFds;