Merge pull request #843 from JacobBarthelmeh/shadow

dgarske · web-flow · commit 51414d681fdb · 2025-10-20T09:16:00.000-07:00
example max() conflicts with toolchains max() function
diff --git a/examples/portfwd/portfwd.c b/examples/portfwd/portfwd.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@`
`72`	`72`	`static const char defaultFwdFromHost[] = "0.0.0.0";`
`73`	`73`
`74`	`74`
`75`		`-static inline int max(int a, int b)`
	`75`	`+static inline int findMax(int a, int b)`
`76`	`76`	`{`
`77`	`77`	`return (a > b) ? a : b;`
`78`	`78`	`}`
`@@ -407,7 +407,7 @@ THREAD_RETURN WOLFSSH_THREAD portfwd_worker(void* args)`
`407`	`407`	`FD_ZERO(&templateFds);`
`408`	`408`	`FD_SET(sshFd, &templateFds);`
`409`	`409`	`FD_SET(listenFd, &templateFds);`
`410`		`- nFds = max(sshFd, listenFd) + 1;`
	`410`	`+ nFds = findMax(sshFd, listenFd) + 1;`
`411`	`411`
`412`	`412`	`for (;;) {`
`413`	`413`	`rxFds = templateFds;`