summaryrefslogtreecommitdiffstats
path: root/libvncserver/rfbserver.c
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2016-04-24 17:02:15 +0200
committerChristian Beier <dontmind@freeshell.org>2016-04-24 17:02:15 +0200
commit785f0fa2d1fe18f08bf521ed4a0d34a5d0c87782 (patch)
tree26aa53ef4fe4eb10fbe75a6f8a465d37331aa9a8 /libvncserver/rfbserver.c
parentfc3dfdd9c59a6a36f7add3255aaad50d56228c59 (diff)
parent53cc1fa18a3b96d2c31a145d971017564fca39bb (diff)
downloadlibtdevnc-785f0fa2d1fe18f08bf521ed4a0d34a5d0c87782.tar.gz
libtdevnc-785f0fa2d1fe18f08bf521ed4a0d34a5d0c87782.zip
Merge pull request #103 from rdieter/master
use namespaced vnc_max macro (issue #102)
Diffstat (limited to 'libvncserver/rfbserver.c')
-rw-r--r--libvncserver/rfbserver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
index e2ab221..bc9cc11 100644
--- a/libvncserver/rfbserver.c
+++ b/libvncserver/rfbserver.c
@@ -367,7 +367,7 @@ rfbNewTCPOrUDPClient(rfbScreenInfoPtr rfbScreen,
}
FD_SET(sock,&(rfbScreen->allFds));
- rfbScreen->maxFd = max(sock,rfbScreen->maxFd);
+ rfbScreen->maxFd = rfbMax(sock,rfbScreen->maxFd);
INIT_MUTEX(cl->outputMutex);
INIT_MUTEX(cl->refCountMutex);