diff options
| author | Christian Beier <dontmind@freeshell.org> | 2016-04-24 17:02:15 +0200 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2016-04-24 17:02:15 +0200 |
| commit | 785f0fa2d1fe18f08bf521ed4a0d34a5d0c87782 (patch) | |
| tree | 26aa53ef4fe4eb10fbe75a6f8a465d37331aa9a8 /rfb | |
| parent | fc3dfdd9c59a6a36f7add3255aaad50d56228c59 (diff) | |
| parent | 53cc1fa18a3b96d2c31a145d971017564fca39bb (diff) | |
| download | libtdevnc-785f0fa2d1fe18f08bf521ed4a0d34a5d0c87782.tar.gz libtdevnc-785f0fa2d1fe18f08bf521ed4a0d34a5d0c87782.zip | |
Merge pull request #103 from rdieter/master
use namespaced vnc_max macro (issue #102)
Diffstat (limited to 'rfb')
| -rw-r--r-- | rfb/rfbproto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rfb/rfbproto.h b/rfb/rfbproto.h index 9cf6a0a..9eca868 100644 --- a/rfb/rfbproto.h +++ b/rfb/rfbproto.h @@ -93,8 +93,8 @@ #define strncasecmp _strnicmp #endif +#define rfbMax(a,b) (((a)>(b))?(a):(b)) #if !defined(WIN32) || defined(__MINGW32__) -#define max(a,b) (((a)>(b))?(a):(b)) #ifdef LIBVNCSERVER_HAVE_SYS_TIME_H #include <sys/time.h> #endif |