diff options
author | Rex Dieter <rdieter@math.unl.edu> | 2016-02-18 08:29:07 -0600 |
---|---|---|
committer | Rex Dieter <rdieter@math.unl.edu> | 2016-04-18 15:17:22 -0500 |
commit | 53cc1fa18a3b96d2c31a145d971017564fca39bb (patch) | |
tree | 573b0f5e508e117e26715fec156f4b8fb5c44638 /libvncserver/httpd.c | |
parent | 5b322f523faa437d8e7d03736bdb1714e8f84ce5 (diff) | |
download | libtdevnc-53cc1fa1.tar.gz libtdevnc-53cc1fa1.zip |
use namespaced rfbMax macro (issue #102)
Not using generic 'max', avoids conflicts with stl_algobase.h
Diffstat (limited to 'libvncserver/httpd.c')
-rw-r--r-- | libvncserver/httpd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvncserver/httpd.c b/libvncserver/httpd.c index 2a778e7..236ab3e 100644 --- a/libvncserver/httpd.c +++ b/libvncserver/httpd.c @@ -192,7 +192,7 @@ rfbHttpCheckFds(rfbScreenInfoPtr rfbScreen) } tv.tv_sec = 0; tv.tv_usec = 0; - nfds = select(max(rfbScreen->httpListen6Sock, max(rfbScreen->httpSock,rfbScreen->httpListenSock)) + 1, &fds, NULL, NULL, &tv); + nfds = select(rfbMax(rfbScreen->httpListen6Sock, rfbMax(rfbScreen->httpSock,rfbScreen->httpListenSock)) + 1, &fds, NULL, NULL, &tv); if (nfds == 0) { return; } |