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/rfbserver.c | |
| parent | 5b322f523faa437d8e7d03736bdb1714e8f84ce5 (diff) | |
| download | libtdevnc-53cc1fa18a3b96d2c31a145d971017564fca39bb.tar.gz libtdevnc-53cc1fa18a3b96d2c31a145d971017564fca39bb.zip | |
use namespaced rfbMax macro (issue #102)
Not using generic 'max', avoids conflicts with stl_algobase.h
Diffstat (limited to 'libvncserver/rfbserver.c')
| -rw-r--r-- | libvncserver/rfbserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c index 34e1c06..68c2de5 100644 --- a/libvncserver/rfbserver.c +++ b/libvncserver/rfbserver.c @@ -369,7 +369,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); |